summaryrefslogtreecommitdiffstats
path: root/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qwindowsurface/tst_qwindowsurface.cpp')
-rw-r--r--tests/auto/qwindowsurface/tst_qwindowsurface.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index 1472aad..9d59c62 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -49,6 +49,7 @@
#include <private/qwindowsurface_p.h>
#include <QDesktopWidget>
+#include <QX11Info>
class tst_QWindowSurface : public QObject
{
@@ -139,6 +140,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);
@@ -155,6 +161,8 @@ void tst_QWindowSurface::flushOutsidePaintEvent()
qt_x11_wait_for_window_manager(&w);
#elif defined(Q_WS_QWS)
QApplication::sendPostedEvents(); //for the glib event loop
+#elif defined(Q_WS_S60)
+ QTest::qWait(5000);
#endif
VERIFY_COLOR(w.geometry(), w.color);
w.reset();