diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:45:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:25:27 +0100 |
| commit | 7f6543a06040f15f30337f71036a5e249c279ed8 (patch) | |
| tree | 9ceff5c478c69cd3aea689b32e10b196c17c9e7e /src | |
| parent | b2e6b77c0862aba5d9f9fc979db8f2d84e47a78a (diff) | |
| parent | a8f64f49ddffd44ca748bb25758d6aa3e71d48ef (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: Ifc771970d7157e22bb7be3b10dcd153f619248a2
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions