projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e99aa8b
)
Disable tst_QPixmap::onlyNullPixmapsOutsideGuiThread on Mac
author
Jiang Jiang
<jiang.jiang@nokia.com>
Mon, 18 Apr 2011 09:21:16 +0000
(11:21 +0200)
committer
Jiang Jiang
<jiang.jiang@nokia.com>
Fri, 29 Apr 2011 09:02:23 +0000
(11:02 +0200)
No need to check it anymore after the switch to raster engine.
Reviewed-by: Eskil
(cherry picked from commit
e004701bd7ba9e4a7cd5ac1bf784829feae16cae
)
tests/auto/qpixmap/tst_qpixmap.cpp
patch
|
blob
|
history
diff --git
a/tests/auto/qpixmap/tst_qpixmap.cpp
b/tests/auto/qpixmap/tst_qpixmap.cpp
index
4d032e8
..
4ba51de
100644
(file)
--- 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()