diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:50:12 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:50:12 +0100 |
| commit | 67e7a44a06d5d4d1c98d04f4b0e1a07583f3bfa5 (patch) | |
| tree | 5fe9c251d3fe9dbf4a21608e02bf424a312b8921 /tests/auto/tiff/tst_qtiff.cpp | |
| parent | e349e6df7a08b4aa15a63fa5f1dcd0f36d598d53 (diff) | |
| parent | 0870e670665a702665948723bb7b1eb61a9572a8 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I519c785ed64bdb0669d884a11d45be6532e629ec
Diffstat (limited to 'tests/auto/tiff/tst_qtiff.cpp')
0 files changed, 0 insertions, 0 deletions