diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/qstyle/tst_qstyle.cpp | |
parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qstyle/tst_qstyle.cpp')
-rw-r--r-- | tests/auto/qstyle/tst_qstyle.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 80850a682f..ae94badbe3 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -73,10 +73,6 @@ #include <qlineedit.h> #include <qmdiarea.h> -#if defined(Q_OS_SYMBIAN) -#define SRCDIR "." -#endif - #include <QCleanlooksStyle> #ifdef Q_WS_MAC @@ -273,17 +269,6 @@ void tst_QStyle::drawItemPixmap() QPixmap p(QString(SRCDIR) + "/task_25863.png", "PNG"); QPixmap actualPix = QPixmap::grabWidget(testWidget); -#ifdef Q_OS_SYMBIAN - // QPixmap cannot be assumed to be exactly same, unless it is created from exactly same content. - // In Symbian, pixmap format might get "optimized" depending on how QPixmap is created. - // Therefore, force the content to specific format and compare QImages. - // Then re-create the QPixmaps and compare those. - QImage i1 = p.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); - p = QPixmap::fromImage(i1); - QImage i2 = actualPix.toImage().convertToFormat(QImage::Format_ARGB32_Premultiplied); - actualPix = QPixmap::fromImage(i2); - QVERIFY(i1 == i2); -#endif QVERIFY(pixmapsAreEqual(&actualPix,&p)); testWidget->hide(); } |