diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-11-11 15:24:37 +0100 |
|---|---|---|
| committer | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2015-11-12 12:23:36 +0000 |
| commit | e5b166875ae6700e407dfdd33242a7ce2618f1d0 (patch) | |
| tree | 166e49b37470d5af6b62920a234ea491efd02959 /tests | |
| parent | d7e27e4d26b5359a60ab5acd89ffcc6b42e974b0 (diff) | |
Stabilize tst_QWindow::childWindowPositioning
Change-Id: I13215eb9f4efc145922e9c4a98d66db568381783
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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); |