summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2012-04-24 18:38:57 +0300
committerQt by Nokia <qt-info@nokia.com>2012-04-25 10:29:56 +0200
commit17ebedf5fc640abbe7af9ffc97bb62404a7eefdd (patch)
treee6de4c735058d3774ae7378cab8fe02c31abad4c /tests
parent82fcbe9d7d7505bb2e3fc53789e14405e73d5302 (diff)
get rid of QT_NO_IMAGE_TEXT switcher
Change-Id: Ie72f907ffb959f629af6a414959348a992c4c941 Reviewed-by: aavit <qt_aavit@ovi.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/gui/image/qimage/tst_qimage.cpp4
1 files changed, 0 insertions, 4 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()
{