diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:15 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:19:15 +0200 |
| commit | 907c43f83768bf1b7fea89960ff5b60a714007d6 (patch) | |
| tree | 1649df9d1cd7281aba9fb4d79060d31cc7be037a /tests/auto | |
| parent | 79f94af0f2e6a1098918bd89241f72403bd5acc6 (diff) | |
| parent | 60d1ebac9e81619a24e66fc6defc3e0299491a9d (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I72d250d21eeed0e7ba30d6c64ef88a797e94a35b
Diffstat (limited to 'tests/auto')
0 files changed, 0 insertions, 0 deletions