diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-18 13:37:02 +0100 |
| commit | ba05397ad723fa19125eb5ca2f91c7f437b21484 (patch) | |
| tree | e236df3317828f02ec1e8f28d87125bcc286b2d9 /tests/auto/quick | |
| parent | b2c71d6518143b3d2a9bd3aef1d72ee5929891fc (diff) | |
| parent | 0e64bd96fbf26855a65e38847083dbd2c6bee4ac (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
.qmake.conf
tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
Change-Id: I7feb9772fc35066f56b7c073482b53ca8c86c70b
Diffstat (limited to 'tests/auto/quick')
| -rw-r--r-- | tests/auto/quick/qquickflickable/tst_qquickflickable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp index f19b18e7c8..bdf7d3dcfd 100644 --- a/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp +++ b/tests/auto/quick/qquickflickable/tst_qquickflickable.cpp @@ -817,7 +817,7 @@ void tst_qquickflickable::returnToBounds() window->rootContext()->setContextProperty("setRebound", setRebound); window->setSource(testFileUrl("resize.qml")); window->show(); - QTest::qWaitForWindowActive(window.data()); + QVERIFY(QTest::qWaitForWindowActive(window.data())); QVERIFY(window->rootObject() != 0); QQuickFlickable *obj = findItem<QQuickFlickable>(window->rootObject(), "flick"); |