diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2014-03-05 10:25:02 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-05 15:01:07 +0100 |
commit | a7269f0b343e0c0a1b0ec774c5abc57f347d5c77 (patch) | |
tree | dd1319aebb02d1e5456a4cc5b4a97cc6c53d0e97 /tests/auto | |
parent | 247f6a34d161f10c4f6d5d516b8bfb7043ca78a2 (diff) |
Make tst_qqmlincubator::chainedAsynchronousIfNested more robust
Don't rely on the exact number of instructions executed in the VME to
determine the loading state of the incubator. With the simpler object
creator that's not based on instructions we might end up creating objects
in less steps, so make the test work with both.
Change-Id: If8a3628cac97251036c9b2cd8f26e75eca1d39ed
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp index ce3710f530..d6d0b0402a 100644 --- a/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp +++ b/tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp @@ -793,13 +793,11 @@ void tst_qqmlincubator::chainedAsynchronousIfNested() controller.incubateWhile(&b); } - QVERIFY(incubator.isLoading()); QVERIFY(incubator1.isReady()); QVERIFY(incubator2.isReady()); - - { - bool b = true; - controller.incubateWhile(&b); + if (incubator.isLoading()) { + bool b = true; + controller.incubateWhile(&b); } QVERIFY(incubator.isReady()); |