Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I910618824785f9119b1e1da9a82e998fd645a96f

2 files changed, 88 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickpathview/data/pathview5.qml b/tests/auto/quick/qquickpathview/data/pathview5.qml
new file mode 100644
index 0000000000..479c5dc500
--- /dev/null
+++ b/tests/auto/quick/qquickpathview/data/pathview5.qml
@@ -0,0 +1,65 @@
+import QtQuick 2.0
+
+PathView {
+    property int countclick: 0
+    id: pathview
+    y: 0
+    width: 348
+    height: 480
+
+    interactive: false
+
+    cacheItemCount: 10
+    currentIndex: 2
+    pathItemCount: 4
+    highlightMoveDuration: 1000
+    highlightRangeMode : PathView.StrictlyEnforceRange
+    preferredHighlightBegin: 0.5
+    preferredHighlightEnd: 0.5
+    snapMode : PathView.SnapOneItem
+
+    path: Path {
+        id: leftPath
+        startX: pathview.width / 2 - 800
+        startY: pathview.height / 2 - 800
+
+        PathArc {
+            x: pathview.width / 2 - 800
+            y: pathview.height / 2 + 800
+            radiusX: 800
+            radiusY: 800
+            direction: PathArc.Clockwise
+        }
+    }
+
+    model: ListModel {
+        id: model
+        ListElement { objectName:"aqua"; name: "aqua" ;mycolor:"aqua"}
+        ListElement { objectName:"blue"; name: "blue" ;mycolor:"blue"}
+        ListElement { objectName:"blueviolet"; name: "blueviolet" ;mycolor:"blueviolet"}
+        ListElement { objectName:"brown"; name: "brown" ;mycolor:"brown"}
+        ListElement { objectName:"chartreuse"; name: "chartreuse" ;mycolor:"chartreuse"}
+    }
+
+    delegate: Item {
+        id: revolveritem
+        objectName: model.objectName
+
+        width: pathview.width
+        height: pathview.height
+
+        Rectangle
+        {
+            id:myRectangle
+            color: mycolor
+            width: pathview.width -20
+            height: pathview.height -20
+
+            Text {
+                anchors.centerIn: parent
+                text: "index:"+index
+                color: "white"
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index bf38d2d926..1a5ce39318 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -104,6 +104,7 @@ private slots:
     void offset_data();
     void offset();
     void setCurrentIndex();
+    void setCurrentIndexWrap();
     void resetModel();
     void propertyChanges();
     void pathChanges();
@@ -1138,6 +1139,28 @@ void tst_QQuickPathView::setCurrentIndex()
     QCOMPARE(currentIndexSpy.count(), 1);
 }
 
+void tst_QQuickPathView::setCurrentIndexWrap()
+{
+    QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("pathview5.qml"));
+    window->show();
+    qApp->processEvents();
+
+    QQuickPathView *pathview = qobject_cast<QQuickPathView*>(window->rootObject());
+    QVERIFY(pathview);
+
+    // set current index to last item
+    pathview->setCurrentIndex(4);
+    // set currentIndex to first item, then quickly set it back (QTBUG-74508)
+    QSignalSpy currentIndexSpy(pathview, SIGNAL(currentIndexChanged()));
+    QSignalSpy movementStartedSpy(pathview, SIGNAL(movementStarted()));
+    pathview->setCurrentIndex(0);
+    pathview->setCurrentIndex(4);
+    QCOMPARE(pathview->currentIndex(), 4);
+    QCOMPARE(currentIndexSpy.count(), 2);
+    QCOMPARE(movementStartedSpy.count(), 0);
+}
+
 void tst_QQuickPathView::resetModel()
 {
     QScopedPointer<QQuickView> window(createView());