diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/plugins/imageformats/macheif/qmacheifhandler.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/imageformats/tiff/qtiffhandler.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/heif/tst_qheif.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/tiff/tst_qtiff.cpp | 9 |
6 files changed, 12 insertions, 14 deletions
diff --git a/.qmake.conf b/.qmake.conf index db2e0b6..898cedc 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.14.0 +MODULE_VERSION = 6.0.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index f286284..561fc11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ -cmake_minimum_required(VERSION 3.14.0) +cmake_minimum_required(VERSION 3.15.0) project(QtImageFormats - VERSION 5.14.0 + VERSION 6.0.0 DESCRIPTION "Qt ImageFormats Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C ) -find_package(Qt5 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Gui) +find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Gui) qt_build_repo() diff --git a/src/plugins/imageformats/macheif/qmacheifhandler.cpp b/src/plugins/imageformats/macheif/qmacheifhandler.cpp index 385d5e2..bb4829e 100644 --- a/src/plugins/imageformats/macheif/qmacheifhandler.cpp +++ b/src/plugins/imageformats/macheif/qmacheifhandler.cpp @@ -98,8 +98,7 @@ bool QMacHeifHandler::supportsOption(ImageOption option) const { return option == Quality || option == Size - || option == ImageTransformation - || option == TransformedByDefault; + || option == ImageTransformation; } QT_END_NAMESPACE diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp index cd70fb9..2efff33 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -843,8 +843,7 @@ bool QTiffHandler::supportsOption(ImageOption option) const return option == CompressionRatio || option == Size || option == ImageFormat - || option == ImageTransformation - || option == TransformedByDefault; + || option == ImageTransformation; } bool QTiffHandler::jumpToNextImage() 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"); |