diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:36:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-24 13:36:08 +0100 |
| commit | 3f9e924417c13f2026fda503a1620f517370466d (patch) | |
| tree | 2ee94771b53dd0d7dcbd7ba098a8b2e58c357eba /.qmake.conf | |
| parent | 3c6d1f97c0b17f572ae569ad56360cca68fe23cb (diff) | |
| parent | c9175b821526a94300f16770cadbd88a0f73acd9 (diff) | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1fea0d1f4b2f99021b94d0922dc1e07bf4d935b1
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions