diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:46:49 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-06 10:48:41 +0200 |
commit | bc317e1ea56c85a41413a5ddde4112623a1b4913 (patch) | |
tree | e51b2b78f81940cfc70b49953308197080cd368f /tests/auto/cpptest/q3dscene/tst_scene.cpp | |
parent | 03cbebd97354b7251e87dcde8adc6b49eba973e5 (diff) | |
parent | 46ef32d424d7e0209e52528286e31f656c654289 (diff) |
Merge branch 'develop'
Change-Id: I2f27b074a095cd449a92778be4681f5e56590e17
Diffstat (limited to 'tests/auto/cpptest/q3dscene/tst_scene.cpp')
-rw-r--r-- | tests/auto/cpptest/q3dscene/tst_scene.cpp | 2 |
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)); |