diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:19 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:28:19 +0100 |
| commit | d9b0e2cde72824d19fb8ef6dfffd8cceb53957a3 (patch) | |
| tree | 1c1e7becae432e888d385b9ab4e8c60d94f45e4a /src/imports/controls/ComboBox.qml | |
| parent | acebfc7f1e50386a83c1f039399cf5cf914b893e (diff) | |
| parent | 5135bec50762955b3a1138ecda10214a9d0bf62a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: I37f9f88a11946d5d67935c682273eb0aa8593f9b
Diffstat (limited to 'src/imports/controls/ComboBox.qml')
0 files changed, 0 insertions, 0 deletions