Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index a53c2ddb5b..aaa8475c74 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -239,7 +239,7 @@ void tst_QImageWriter::writeImage2_data()
         // QLatin1String("jpeg"),
     };
 
-    QImage image0(70, 70, QImage::Format_ARGB32);
+    QImage image0(70, 70, QImage::Format_RGB32);
     image0.fill(QColor(Qt::red).rgb());
 
     QImage::Format imgFormat = QImage::Format_Mono;
@@ -304,10 +304,10 @@ void tst_QImageWriter::writeImage2()
     if (!equalImageContents(written, image)) {
         qDebug() << "image" << image.format() << image.width()
                  << image.height() << image.depth()
-                 << hex << image.pixel(0, 0);
+                 << image.pixelColor(0, 0);
         qDebug() << "written" << written.format() << written.width()
                  << written.height() << written.depth()
-                 << hex << written.pixel(0, 0);
+                 << written.pixelColor(0, 0);
     }
     QVERIFY(equalImageContents(written, image));
 
@@ -408,6 +408,7 @@ void tst_QImageWriter::supportsOption_data()
                          << (QIntList() << QImageIOHandler::Gamma
                               << QImageIOHandler::Description
                               << QImageIOHandler::Quality
+                              << QImageIOHandler::CompressionRatio
                               << QImageIOHandler::Size
                               << QImageIOHandler::ScaledSize);
 }