diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:03:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:03:47 +0100 |
| commit | 698a8268f786d74726eb07255df2d26ac2269079 (patch) | |
| tree | 7f63974c3a13b507166e84459be7b5fc2787d2e1 /LICENSE.LGPLv3 | |
| parent | 314d1bdf7d56462102639e12d34596cbfd4fce95 (diff) | |
| parent | eb048e486daa3644476fdec5b0bd016b1729fc01 (diff) | |
| download | qtquickcontrols-698a8268f786d74726eb07255df2d26ac2269079.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/dialogs/qquickabstractfiledialog_p.h
tests/auto/controls/data/tst_combobox.qml
Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
Diffstat (limited to 'LICENSE.LGPLv3')
0 files changed, 0 insertions, 0 deletions