diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-14 21:52:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-14 22:17:32 +0100 |
| commit | 60300fda463ae0f31c1e66ca253a2a976a88ee20 (patch) | |
| tree | b2264433418280ccbb7ed173892456fce4fab43a /examples/qmltest | |
| parent | db462cce86dba0be80239d4aaaea668ef173af3d (diff) | |
| parent | 0e3380f9c6ab6e3ea7398caccf5aa84f1575f1cd (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I9d87ed86e95b5901a86cc3aa65d7ac39b0b708c2
Diffstat (limited to 'examples/qmltest')
0 files changed, 0 insertions, 0 deletions