summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2017-04-24 15:10:16 +0200
committerLiang Qi <liang.qi@qt.io>2017-04-24 14:38:37 +0000
commitffc1cab21ade6fc4b0ab574dbb5507c677d32841 (patch)
tree6e0de42e00ed25e0367f653fe35135ed711e714a
parent3ba11cf93820610273e2a16b13ab1d8c57a41d36 (diff)
downloadqtquickcontrols-ffc1cab21ade6fc4b0ab574dbb5507c677d32841.tar.gz
tst_dialogs: make QML errors visiblev5.9.0-beta3
Change-Id: Ib466b1c42e232d75a022588e99e9e204a8c7bad9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--tests/auto/dialogs/tst_dialogs.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/dialogs/tst_dialogs.cpp b/tests/auto/dialogs/tst_dialogs.cpp
index 1f139966..20da6e43 100644
--- a/tests/auto/dialogs/tst_dialogs.cpp
+++ b/tests/auto/dialogs/tst_dialogs.cpp
@@ -87,7 +87,7 @@ void tst_dialogs::dialogImplicitWidth()
component.loadUrl(testFileUrl("DialogImplicitSize.qml"));
QObject *created = component.create();
QScopedPointer<QObject> cleanup(created);
- QVERIFY(created);
+ QVERIFY2(created, qPrintable(component.errorString()));
QTRY_VERIFY(created->property("width").toInt() >= 400);
QTRY_VERIFY(created->property("height").toInt() >= minimumHeight + heightMargins);
@@ -100,7 +100,7 @@ void tst_dialogs::dialogContentResize()
component.loadUrl(testFileUrl("DialogMinimumSize.qml"));
QObject *created = component.create();
QScopedPointer<QObject> cleanup(created);
- QVERIFY(created);
+ QVERIFY2(created, qPrintable(component.errorString()));
QTRY_COMPARE(created->property("width").toInt(), 400);
QTRY_COMPARE(created->property("height").toInt(), 300);
@@ -121,7 +121,7 @@ void tst_dialogs::fileDialogDefaultModality()
window->setGeometry(240,240,1024,320);
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window));
- QVERIFY(window->rootObject());
+ QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString()));
// Click to show
QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
@@ -167,7 +167,7 @@ void tst_dialogs::fileDialogNonModal()
window->setGeometry(240,240,1024,320);
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window));
- QVERIFY(window->rootObject());
+ QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString()));
// Click to toggle visibility
QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
@@ -196,7 +196,7 @@ void tst_dialogs::fileDialogNameFilters()
window->setGeometry(240,240,1024,320);
window->show();
QVERIFY(QTest::qWaitForWindowExposed(window));
- QVERIFY(window->rootObject());
+ QVERIFY2(window->rootObject(), qPrintable(window->errors().value(0).toString()));
QObject *dlg = qvariant_cast<QObject *>(window->rootObject()->property("fileDialog"));
QStringList filters;