diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:19:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:19:02 +0100 |
| commit | acddf902facb16b40d3f9c0ccd28fcdbc49c87dc (patch) | |
| tree | a8df4e7c92866994e6f759d3502b3ef646045511 /src/imports/winextras/qmldir | |
| parent | 4372bfab4247fe4468ad4d38071ff1c4b920585c (diff) | |
| parent | cffeddfab1467561ec7a2df7ccbe6c634cdf89a6 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
.qmake.conf
Change-Id: I2b3428a182d8012eee19acbaa0666c184a26d8d0
Diffstat (limited to 'src/imports/winextras/qmldir')
0 files changed, 0 insertions, 0 deletions