summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorninerider <qt-info@nokia.com>2009-10-01 11:28:01 (GMT)
committerninerider <qt-info@nokia.com>2009-10-01 11:28:01 (GMT)
commit210b0fabc4c983049ad5c6823a5723554e1fd108 (patch)
tree1dac9cc6959cb17f8f49e91948acaea81cde220d
parentac557bcf08f651b1634235d70bc6c02512ab8c49 (diff)
downloadQt-210b0fabc4c983049ad5c6823a5723554e1fd108.zip
Qt-210b0fabc4c983049ad5c6823a5723554e1fd108.tar.gz
Qt-210b0fabc4c983049ad5c6823a5723554e1fd108.tar.bz2
Disabled icon conversion functions for WinCE
These test will require more work on WinCE which we will invest shortly. Reviewed-by: Joerg
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 8151e62..2568b94 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -1034,6 +1034,10 @@ void tst_QPixmap::toWinHICON_data()
void tst_QPixmap::toWinHICON()
{
+#ifdef Q_OS_WINCE
+ QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll);
+#endif
+
QFETCH(int, width);
QFETCH(int, height);
QFETCH(QString, image);
@@ -1074,6 +1078,10 @@ void tst_QPixmap::fromWinHICON_data()
void tst_QPixmap::fromWinHICON()
{
+#ifdef Q_OS_WINCE
+ QSKIP("Test shall be enabled for Windows CE shortly.", SkipAll);
+
+#else
QFETCH(int, width);
QFETCH(int, height);
QFETCH(QString, image);
@@ -1090,6 +1098,7 @@ void tst_QPixmap::fromWinHICON()
// QVERIFY(imageFromHICON == imageFromFile);
compareImages(imageFromHICON, imageFromFile);
+#endif
}
#endif // Q_WS_WIN