diff options
author | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-06-27 07:50:05 +0200 |
commit | 8b36cdd25761348c285305edec1bf861a924e858 (patch) | |
tree | f4b96b64ad5d93d92ae82e7d18ad60e8d72ce236 /tests/auto/dialogs/tst_dialogs.cpp | |
parent | d13e4db9d74aefc0bd08ca946b789155a11361fb (diff) | |
parent | f19b1bf1bfee79178bf5cd75df86863be49c21f0 (diff) | |
download | qtquickcontrols-8b36cdd25761348c285305edec1bf861a924e858.tar.gz |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: Ie6ad3e9490dcf85bd5deb4c6d7004a4aa8b81433
Diffstat (limited to 'tests/auto/dialogs/tst_dialogs.cpp')
-rw-r--r-- | tests/auto/dialogs/tst_dialogs.cpp | 10 |
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; |