From 2762073738d0343b2ba6e38624de2040c34bc393 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Fri, 14 Jun 2019 19:07:42 +0200
Subject: Fix qt6 build

Bumped version.
Adjusted code for removal of the TransformedByDefault enum.
The enum is removed in Qt6 code, so existing tests need to be adapted
to call setAutoTransform() for plugins that usually had autoTransform
enabled by default.
The new Qt6 default is that all plugins have autoTransform disabled
by default.

Change-Id: Ifa45375a4bc42ba1d863cb96af16776ea6dd0632
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 tests/auto/heif/tst_qheif.cpp | 3 +++
 tests/auto/tiff/tst_qtiff.cpp | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/heif/tst_qheif.cpp b/tests/auto/heif/tst_qheif.cpp
index 26ddf73..1b68074 100644
--- a/tests/auto/heif/tst_qheif.cpp
+++ b/tests/auto/heif/tst_qheif.cpp
@@ -65,6 +65,7 @@ void tst_qheif::readImage()
 
     QString path = QStringLiteral(":/heif/") + fileName;
     QImageReader reader(path);
+    reader.setAutoTransform(true);
     QVERIFY(reader.canRead());
     QImage image = reader.read();
     QVERIFY(!image.isNull());
@@ -86,6 +87,7 @@ void tst_qheif::readProperties()
 
     QString path = QStringLiteral(":/heif/") + fileName;
     QImageReader reader(path);
+    reader.setAutoTransform(true);
     QCOMPARE(reader.size(), rawSize);
     QCOMPARE(int(reader.transformation()), transform);
 
@@ -138,6 +140,7 @@ void tst_qheif::writeImage()
         QImage rimg2;
         buf2.open(QIODevice::ReadOnly);
         QImageReader reader(&buf2);
+        reader.setAutoTransform(true);
         QVERIFY(reader.read(&rimg2));
         buf2.close();
         QVERIFY(rimg2.size() == img.size().transposed());
diff --git a/tests/auto/tiff/tst_qtiff.cpp b/tests/auto/tiff/tst_qtiff.cpp
index b2c5546..f1db377 100644
--- a/tests/auto/tiff/tst_qtiff.cpp
+++ b/tests/auto/tiff/tst_qtiff.cpp
@@ -420,8 +420,7 @@ void tst_qtiff::readWriteNonDestructive()
     QImageReader reader(&buf);
     QCOMPARE(reader.imageFormat(), expectedFormat);
     QCOMPARE(reader.size(), image.size());
-    QCOMPARE(reader.autoTransform(), true);
-    reader.setAutoTransform(false);
+    QCOMPARE(reader.autoTransform(), false);
     QCOMPARE(reader.transformation(), transformation);
     QImage image2 = reader.read();
     QVERIFY2(!image.isNull(), qPrintable(reader.errorString()));
@@ -466,8 +465,7 @@ void tst_qtiff::supportsOption_data()
     QTest::newRow("tiff") << (QIntList()
                               << QImageIOHandler::Size
                               << QImageIOHandler::CompressionRatio
-                              << QImageIOHandler::ImageTransformation
-                              << QImageIOHandler::TransformedByDefault);
+                              << QImageIOHandler::ImageTransformation);
 }
 
 void tst_qtiff::supportsOption()
@@ -489,8 +487,7 @@ void tst_qtiff::supportsOption()
                << QImageIOHandler::Endianness
                << QImageIOHandler::Animation
                << QImageIOHandler::BackgroundColor
-               << QImageIOHandler::ImageTransformation
-               << QImageIOHandler::TransformedByDefault;
+               << QImageIOHandler::ImageTransformation;
 
     QImageWriter writer;
     writer.setFormat("tiff");
-- 
cgit v1.2.1