summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-10-29 14:08:02 +0100
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2014-10-29 22:52:14 +0100
commit1f92491bd95abc642dcd882846884a5271c8ba16 (patch)
tree715e0b2a2aa5383ae302f30d13afbb1c58699120 /tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
parent23da8cb2010d8e23be7711182f4ee9267f0edd38 (diff)
Extend timeout in tst_qdeclarativetextedit::delegateLoadingv5.4.0-rc1v5.4.0
On some CI machines (OS X 10.7) this test actually passes but takes 5100 ms to load the delegate. Task-number: QTBUG-42264 Change-Id: I008cbf0e163257c800370951920384108e5a390b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp')
-rw-r--r--tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index dd372aba..47c266bc 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -1935,7 +1935,7 @@ void tst_qdeclarativetextedit::delegateLoading()
QTRY_VERIFY(view->status()==QDeclarativeView::Error);
QTRY_VERIFY(!view->rootObject()); // there is fail item inside this test
} else {
- QTRY_VERIFY(view->rootObject());//Wait for loading to finish.
+ QTRY_VERIFY_WITH_TIMEOUT(view->rootObject(), 7000);//Wait for loading to finish.
QDeclarativeTextEdit *textEditObject = view->rootObject()->findChild<QDeclarativeTextEdit*>("textEditObject");
// view->rootObject()->dumpObjectTree();
QVERIFY(textEditObject != 0);