diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:30:58 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:30:58 +0200 |
| commit | 11c1390b44cc0398ae8739eb2e7a440140fa6176 (patch) | |
| tree | d1affa983e935392c33feb54291cc3decbfb57ad /tests | |
| parent | 020cc303b46b4dc96c33d4e89bff1d6c2f125d87 (diff) | |
| parent | 93a998f5ef31f7d9f8dd72909c4342db84cc1b59 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: Id7890339704dcb0670fd67e66973cea0b643cab1
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions