diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 20:57:16 +0100 |
| commit | cb800de1f42aaacdeb423d30adbcbf8975e32f2f (patch) | |
| tree | 7493c2b814c5f3c780fc7338c62660846fdb6e92 /tests | |
| parent | 14f86268e7f149a3c881203227321c3fd085e4d9 (diff) | |
| parent | eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Id59a8238134f1b0e172b22cd7e95d984a3f66401
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tiff/tst_qtiff.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp index ec45b66..ae7d5a5 100644 --- a/tests/auto/tiff/tst_qtiff.cpp +++ b/tests/auto/tiff/tst_qtiff.cpp @@ -341,6 +341,7 @@ void tst_qtiff::writeImage() QImageWriter writer(&buf, format); QVERIFY(writer.write(image)); } + image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); QImage image2; { |