diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-15 11:21:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-15 11:21:15 +0100 |
| commit | 3e7b3aae9c736ec62a727f218a73f86886e2a367 (patch) | |
| tree | d06037b68eb1f69619957ab1883ddcdb56790f65 /examples/quickcontrols/extras | |
| parent | b9c95d63efde5d0ee9d332074285d5a4800391b5 (diff) | |
| parent | 15c909f4170450cdbe01218a0d7cbea55b70fae5 (diff) | |
| download | qtquickcontrols-3e7b3aae9c736ec62a727f218a73f86886e2a367.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: If27d9c3cbc17765c4180651189c4b8d19b8409da
Diffstat (limited to 'examples/quickcontrols/extras')
0 files changed, 0 insertions, 0 deletions