diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 11:55:46 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-19 08:32:21 +0200 |
commit | 02d5a71a1d3e2cee2c125af53bf8415218b3c280 (patch) | |
tree | 7cf7c0668a5ae6d7c9f4bbfa5914a6fa182e2ac0 | |
parent | c2ef6a35562f41a6b76d11337e8a4cc6ccf4f512 (diff) | |
parent | 05aed6f25fbe0f685224f0afb7a46092d8710c09 (diff) |
Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"
-rw-r--r-- | .qmake.conf | 3 | ||||
-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 |
5 files changed, 10 insertions, 11 deletions
diff --git a/.qmake.conf b/.qmake.conf index b3c7403..e139c9b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,5 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.0 +MODULE_VERSION = 6.0.0 + 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 0d0a133..57def2c 100644 --- a/src/plugins/imageformats/tiff/qtiffhandler.cpp +++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp @@ -862,8 +862,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 be02460..87fdfa8 100644 --- a/tests/auto/tiff/tst_qtiff.cpp +++ b/tests/auto/tiff/tst_qtiff.cpp @@ -423,8 +423,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())); @@ -469,8 +468,7 @@ void tst_qtiff::supportsOption_data() QTest::newRow("tiff") << (QIntList() << QImageIOHandler::Size << QImageIOHandler::CompressionRatio - << QImageIOHandler::ImageTransformation - << QImageIOHandler::TransformedByDefault); + << QImageIOHandler::ImageTransformation); } void tst_qtiff::supportsOption() @@ -492,8 +490,7 @@ void tst_qtiff::supportsOption() << QImageIOHandler::Endianness << QImageIOHandler::Animation << QImageIOHandler::BackgroundColor - << QImageIOHandler::ImageTransformation - << QImageIOHandler::TransformedByDefault; + << QImageIOHandler::ImageTransformation; QImageWriter writer; writer.setFormat("tiff"); |