diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-10 08:56:35 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-10 08:56:35 +0200 |
| commit | f61ec84fc296c6f70011e30788ee511d6b6a18c6 (patch) | |
| tree | 54b3b81ac83570e65dc9b44b6756005f6ba1efde /tests/auto/qwindowsurface | |
| parent | cc0a411e5e874aa224c26298a109973cb15ea291 (diff) | |
| parent | d13418effc5f00474541ae513a30c9a42c2a1cb3 (diff) | |
| download | qt4-tools-f61ec84fc296c6f70011e30788ee511d6b6a18c6.tar.gz | |
Merge commit 'qt/master-stable'
Conflicts:
src/corelib/kernel/qobject.cpp
src/corelib/tools/qsharedpointer_impl.h
src/gui/widgets/qdatetimeedit.cpp
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qlineedit.cpp
tests/auto/qcssparser/qcssparser.pro
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qmultiscreen/qmultiscreen.pro
tests/auto/qresourceengine/qresourceengine.pro
tests/auto/qresourceengine/tst_qresourceengine.cpp
tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
Diffstat (limited to 'tests/auto/qwindowsurface')
| -rw-r--r-- | tests/auto/qwindowsurface/tst_qwindowsurface.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index fcec097a6d..fe71b723d2 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); |