diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 20:59:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 21:00:09 +0100 |
| commit | 6c9f0bfcc4bc6511686559dd87c29cfaa3e88b33 (patch) | |
| tree | 2ce51a6a80fca98a9dae34508ef07bddf44e6ba9 /tests/auto/auto.pro | |
| parent | 25d6bd04611837cbc81f6a1247c3008f08ed9f9d (diff) | |
| parent | 93c5dc8b5abdbdfca505dd4d3d9892856d1f51d7 (diff) | |
| download | qtquickcontrols-5.11.0-beta1.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta1
Conflicts:
.qmake.conf
Change-Id: I3c4c27d0942058c8d8c325f92688675c14887a4b
Diffstat (limited to 'tests/auto/auto.pro')
0 files changed, 0 insertions, 0 deletions