From e5b166875ae6700e407dfdd33242a7ce2618f1d0 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 11 Nov 2015 15:24:37 +0100 Subject: Stabilize tst_QWindow::childWindowPositioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I13215eb9f4efc145922e9c4a98d66db568381783 Reviewed-by: Tor Arne Vestbø --- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index a953a36559..79bfc8bf53 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -563,8 +563,9 @@ void tst_QWindow::childWindowPositioning() } // Creation order shouldn't affect the geometry - QCOMPARE(topLevelWindowFirst.geometry(), topLevelWindowAfter.geometry()); - QCOMPARE(childWindowAfter.geometry(), childWindowFirst.geometry()); + // Use try compare since on X11 the window manager may still re-position the window after expose + QTRY_COMPARE(topLevelWindowFirst.geometry(), topLevelWindowAfter.geometry()); + QTRY_COMPARE(childWindowAfter.geometry(), childWindowFirst.geometry()); // Creation order shouldn't affect the child ending up at 0,0 QCOMPARE(childWindowFirst.framePosition(), topLeftOrigin); -- cgit v1.2.3