diff options
Diffstat (limited to 'tests/auto/gui/image')
| -rw-r--r-- | tests/auto/gui/image/qimage/tst_qimage.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimagereader/tst_qimagereader.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index c5c2b13b3e..65571f13c2 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -88,9 +88,7 @@ private slots: void dotsPerMeterZero(); void convertToFormatPreserveDotsPrMeter(); -#ifndef QT_NO_IMAGE_TEXT void convertToFormatPreserveText(); -#endif void rotate_data(); void rotate(); @@ -1143,7 +1141,6 @@ void tst_QImage::convertToFormatPreserveDotsPrMeter() QCOMPARE(img.dotsPerMeterY(), dpmy); } -#ifndef QT_NO_IMAGE_TEXT void tst_QImage::convertToFormatPreserveText() { QImage img(100, 100, QImage::Format_ARGB32_Premultiplied); @@ -1168,7 +1165,6 @@ void tst_QImage::convertToFormatPreserveText() QCOMPARE(imgResult2.text(), result); QCOMPARE(imgResult2.textKeys(), listResult); } -#endif // QT_NO_IMAGE_TEXT void tst_QImage::setColorCount() { diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp index 876d69ea1c..12c90445cb 100644 --- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp @@ -1487,7 +1487,8 @@ void tst_QImageReader::supportsOption_data() << (QIntList() << QImageIOHandler::Gamma << QImageIOHandler::Description << QImageIOHandler::Quality - << QImageIOHandler::Size); + << QImageIOHandler::Size + << QImageIOHandler::ScaledSize); } void tst_QImageReader::supportsOption() diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp index 827fa3606c..f28f84dc60 100644 --- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp +++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp @@ -394,7 +394,8 @@ void tst_QImageWriter::supportsOption_data() << (QIntList() << QImageIOHandler::Gamma << QImageIOHandler::Description << QImageIOHandler::Quality - << QImageIOHandler::Size); + << QImageIOHandler::Size + << QImageIOHandler::ScaledSize); } void tst_QImageWriter::supportsOption() |