diff options
| author | Simo Fält <simo.falt@theqtcompany.com> | 2014-12-03 17:23:10 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-03 17:23:10 +0100 |
| commit | afb90face057ffb0a2ff15373e7a2295aa745a90 (patch) | |
| tree | 239984461f425906083d841225fa8064b3a401ec | |
| parent | 6ebb870eab29388b2c668c5b7571465dede10808 (diff) | |
| parent | ef80ceb88e0dc609c551c7edae6436ca86cef84c (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 4f834e7a..8ac6016c 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -1682,6 +1682,10 @@ void tst_qdeclarativelanguage::importsRemote() QFETCH(QString, type); QFETCH(QString, error); +#ifdef Q_OS_WIN + if (type != "QDeclarativeRectangle") + QSKIP("Test crashes on windows for non-obvious reasons. QTBUG-30131"); +#endif TestHTTPServer server(14447); server.serveDirectory(directory()); 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); |