diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 10:35:03 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 10:35:03 +0100 |
| commit | 3e5392dab0fbf1827aad23a5e573df7e8a86b601 (patch) | |
| tree | 9c2c692fd88116a3c88f1f556b3699662eef3dcb /src/quickcontrols2/qquickiconlabel.cpp | |
| parent | efa04c2ae8427c70848477ace3d8f6e82baaab11 (diff) | |
| parent | fa4b1aa6024f5f3b2d0e0502561b1eaedddd0c78 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ib3b90cce1f4422b308515b06e89b1c4a0bf7f474
Diffstat (limited to 'src/quickcontrols2/qquickiconlabel.cpp')
0 files changed, 0 insertions, 0 deletions