summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-04-18 09:21:16 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2011-04-18 09:58:56 (GMT)
commite004701bd7ba9e4a7cd5ac1bf784829feae16cae (patch)
treece117cb8059e7820f72e40481dd82e017e5baf47
parent3197fe2af911673c6291db0102e90a0d7f6ae926 (diff)
downloadQt-e004701bd7ba9e4a7cd5ac1bf784829feae16cae.zip
Qt-e004701bd7ba9e4a7cd5ac1bf784829feae16cae.tar.gz
Qt-e004701bd7ba9e4a7cd5ac1bf784829feae16cae.tar.bz2
Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac
No need to check it anymore after the switch to raster engine. Reviewed-by: Eskil
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp
index 4d032e8..4ba51de 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/qpixmap/tst_qpixmap.cpp
@@ -1337,7 +1337,7 @@ void tst_QPixmap::toSymbianCFbsBitmap()
void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
{
-#if !defined(Q_WS_WIN)
+#if !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
class Thread : public QThread
{
public:
@@ -1370,7 +1370,7 @@ void tst_QPixmap::onlyNullPixmapsOutsideGuiThread()
thread.wait();
#endif
-#endif // !defined(Q_WS_WIN)
+#endif // !defined(Q_WS_WIN) && !defined(Q_WS_MAC)
}
void tst_QPixmap::refUnref()