Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Id27c36e55fcc68cc1140b0d9bec00b8ae6b52ed0

2 files changed, 6 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml b/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml
index a02b66b8af..8aff649a67 100644
--- a/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml
+++ b/tests/auto/quick/qquicklistview/data/listview-initCurrent.qml
@@ -6,6 +6,7 @@ Rectangle {
     property int current: list.currentIndex
     property bool showHeader: false
     property bool showFooter: false
+    property int currentItemChangedCount: 0
 
     width: 240
     height: 320
@@ -60,5 +61,7 @@ Rectangle {
         model: testModel
         header: root.showHeader ? headerFooter : null
         footer: root.showFooter ? headerFooter : null
+
+        onCurrentItemChanged: { root.currentItemChangedCount++ }
     }
 }
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 472ffdc4b6..8e7f93849c 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -2718,9 +2718,12 @@ void tst_QQuickListView::currentIndex()
     QTRY_COMPARE(listview->highlightItem()->y(), hlPos);
 
     // insert item before currentIndex
+    window->rootObject()->setProperty("currentItemChangedCount", QVariant(0));
     listview->setCurrentIndex(28);
+    QTRY_COMPARE(window->rootObject()->property("currentItemChangedCount").toInt(), 1);
     model.insertItem(0, "Foo", "1111");
     QTRY_COMPARE(window->rootObject()->property("current").toInt(), 29);
+    QCOMPARE(window->rootObject()->property("currentItemChangedCount").toInt(), 1);
 
     // check removing highlight by setting currentIndex to -1;
     listview->setCurrentIndex(-1);