summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-08-06 11:25:43 (GMT)
committerJocelyn Turcotte <jocelyn.turcotte@nokia.com>2009-08-06 11:39:14 (GMT)
commit504866ffcf57461774bc39357b23954df3a2d9ee (patch)
treec56d55ebe6023fdbcb7e0d3d48f379f06e9f4233
parentbcf834abc2ff2a97be94f1c287753fb4c58e8da8 (diff)
downloadQt-504866ffcf57461774bc39357b23954df3a2d9ee.zip
Qt-504866ffcf57461774bc39357b23954df3a2d9ee.tar.gz
Qt-504866ffcf57461774bc39357b23954df3a2d9ee.tar.bz2
Skip tst_QWindowSurface::flushOutsidePaintEvent() when using composition manager
The first VERIFY_COLOR(w.geometry(), w.color); call was failing because the window was mapped but not yet painted on the screen. Reviewed-by: Bradley T. Hughes
-rw-r--r--tests/auto/qwindowsurface/tst_qwindowsurface.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index ddd1930..b03cd05 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -48,6 +48,7 @@
#include <private/qwindowsurface_p.h>
#include <QDesktopWidget>
+#include <QX11Info>
class tst_QWindowSurface : public QObject
{
@@ -138,6 +139,11 @@ void tst_QWindowSurface::getSetWindowSurface()
void tst_QWindowSurface::flushOutsidePaintEvent()
{
+#ifdef Q_WS_X11
+ if (QX11Info::isCompositingManagerRunning())
+ QSKIP("Test is unreliable with composition manager", SkipAll);
+#endif
+
#ifdef Q_WS_WIN
if (QSysInfo::WindowsVersion & QSysInfo::WV_VISTA) {
QTest::qWait(1000);