diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-04 10:21:53 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-04 10:21:53 +0100 |
| commit | a4317a8f2732213d9d804363918e12b39e308ce2 (patch) | |
| tree | 2630ad88e4ad2ad2b709c71bf67469dd69af5a06 /src/imports/controls/doc/images/qtquickcontrols2-imagine-customization-dark.png | |
| parent | 9898744e2ea17e805da559faeb677c9f5bbe080f (diff) | |
| parent | 5c1aa494e95b2945500e3c3e62240dd60e7190d6 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
Change-Id: Ibf7cf09570e73ad2f314e9ce7acf1c766ac3f332
Diffstat (limited to 'src/imports/controls/doc/images/qtquickcontrols2-imagine-customization-dark.png')
0 files changed, 0 insertions, 0 deletions