diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:29:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:29:03 +0100 |
| commit | 9aeb3523a7fc521b725be106b1521335061c43b3 (patch) | |
| tree | 231f267ad1dc0aac68b92498ae73f107bdf834dc /examples/svg/embeddedsvgviewer/main.cpp | |
| parent | a72ce34fd4f2fb0035bd982201bafedc0b6cd364 (diff) | |
| parent | 582bbf973f608e8a3b9d5e3b8318eb995930e4a0 (diff) | |
| download | qtsvg-9aeb3523a7fc521b725be106b1521335061c43b3.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I300b232530fa6d8694f16d0f7093d56698c23ab1
Diffstat (limited to 'examples/svg/embeddedsvgviewer/main.cpp')
0 files changed, 0 insertions, 0 deletions