diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:44:36 +0100 |
| commit | 0a6b30351a0e80447c2dd683765fc1fe66c1eda2 (patch) | |
| tree | 6802cbb320ed999f5110b872c33c4e86a5172fbb /tests/tests.pro | |
| parent | 032c1e73ef289e64ee38c77faf26c46c74312043 (diff) | |
| parent | a5881f10e0ba6ba283b1215a5342056196661414 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I17dec1cd2d4934710663e5fa97c926a65fe301e5
Diffstat (limited to 'tests/tests.pro')
0 files changed, 0 insertions, 0 deletions