summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/kernel
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2014-12-18 15:44:38 +0100
committerGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2014-12-18 17:56:03 +0100
commit622df95fee5ddea737ae3030dbae1286ffd4a454 (patch)
tree41747dc9e0c098dc88c2ba2c89c5133faa406740 /tests/auto/gui/kernel
parentf7716732a5d406a21fa0ca1bcc8607eb21ba4e54 (diff)
Prospective stabilization fix for tst_qwindow::positioning(default)
Our theory for the failure of framePosition() not having the expected value after setFramePosition towards the end of the test is that we try to call setFramePosition() while the getting-back-from-fullscreen-to-normal window animation is still running, at which point the compositor may just choose to ignore our move request. Similarly to when going fullscreen, also wait when coming back from it. Change-Id: Icfc92f277d96dccdfad772c4aac252b2a20c6196 Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Diffstat (limited to 'tests/auto/gui/kernel')
-rw-r--r--tests/auto/gui/kernel/qwindow/tst_qwindow.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
index a5442968c6..61ba99c7de 100644
--- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
+++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
@@ -298,6 +298,8 @@ void tst_QWindow::positioning()
QTRY_VERIFY(window.received(QEvent::Resize) > 0);
#endif
+ QTest::qWait(2000);
+
QTRY_COMPARE(originalPos, window.position());
QTRY_COMPARE(originalFramePos, window.framePosition());
QTRY_COMPARE(originalMargins, window.frameMargins());