summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-30 14:45:15 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-31 09:19:13 +0200
commit89911624cf0d8726ee594d5b689881990592e09b (patch)
tree5f29190f2878eeb261ad97d43315d525406f9e4f
parent2d61b8f27a74168ca06a32c4d2f077af2cbc7b88 (diff)
Allow small delay in scene test for viewport resize
On linux, there seems to be some asynchronous activity related to window resizing, since calling processEvents() is not enough to ensure viewport size gets updated in subViews test. Use QTRY_COMPARE to allow for small delay. Change-Id: Idae04ff9436c819ef150caa57f6fa988e4011746 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--tests/auto/cpptest/q3dscene/tst_scene.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/cpptest/q3dscene/tst_scene.cpp b/tests/auto/cpptest/q3dscene/tst_scene.cpp
index 7d1ecad3..83eff9eb 100644
--- a/tests/auto/cpptest/q3dscene/tst_scene.cpp
+++ b/tests/auto/cpptest/q3dscene/tst_scene.cpp
@@ -136,7 +136,7 @@ void tst_scene::subViews()
QCoreApplication::processEvents();
- QCOMPARE(scene->viewport(), QRect(0, 0, 200, 200));
+ QTRY_COMPARE(scene->viewport(), QRect(0, 0, 200, 200));
QCOMPARE(scene->primarySubViewport(), QRect(0, 0, 200, 200));
QCOMPARE(scene->secondarySubViewport(), QRect(0, 0, 0, 0));