diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:08:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:58:24 +0200 |
| commit | 915ee2598030b799aeb67908bae49a70b4079e37 (patch) | |
| tree | 7bb01b65f0b573105f4cc59a44cde88160950b4c /tests | |
| parent | de4c1f09a00884a959bf7f53d38c204d14064c21 (diff) | |
| parent | 59efd8f79abd30a71e3bb81070cae2af2eede842 (diff) | |
| download | qtx11extras-915ee2598030b799aeb67908bae49a70b4079e37.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I71045f74b946a2daf85693016b444a0301ef2ea9
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions