diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-08-15 12:23:50 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 13:30:12 +0200 |
| commit | eabf64ed680dc85082ed325c3db5cb20049d3d97 (patch) | |
| tree | fc8cd9d260116bc4e63c47aaa7a6d25b3a444a7d /tests/auto/controls | |
| parent | 8b36cdd25761348c285305edec1bf861a924e858 (diff) | |
| parent | a77494140324c3ede1f7c16086593c070d81e2b3 (diff) | |
| download | qtquickcontrols-eabf64ed680dc85082ed325c3db5cb20049d3d97.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Icfa0daf5e65337745f5986afee7cd3c8043fafa0
Diffstat (limited to 'tests/auto/controls')
0 files changed, 0 insertions, 0 deletions