diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-09 01:01:09 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-12-09 12:22:24 +0000 |
| commit | 8182a8044f3b9e6c25c3b50b1c7f34d2900a3207 (patch) | |
| tree | 22489011cb506ada47b8a71d403d3f128bad4f10 /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | |
| parent | 3c4247e1e021b6bcc480afc0716e0231575d0501 (diff) | |
| parent | 51e02fdc02c3cc2dbf9d2ba0b3fb709a6cd4e32e (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qml/common/qv4compileddata_p.h
Change-Id: I1150c8cd0161f0e22137d383013751394ae64e18
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
| -rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index 4c147b753b..e527853148 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -2908,7 +2908,11 @@ void tst_QQuickListView::currentIndex() // empty model should reset currentIndex to -1 QaimModel emptyModel; + window->rootObject()->setProperty("currentItemChangedCount", QVariant(0)); + QVERIFY(QQmlProperty(window->rootObject(), "s").read().toString() != QLatin1String("-1")); ctxt->setContextProperty("testModel", &emptyModel); + QCOMPARE(QQmlProperty(window->rootObject(), "s").read().toString(), "-1"); + QCOMPARE(window->rootObject()->property("currentItemChangedCount").toInt(), 1); QCOMPARE(listview->currentIndex(), -1); delete window; |