Clear stringCache explicitly instead of asserting its emptiness.

This assumption does not hold when PathView's path.pathElements list is
updated with new contents at runtime.

Task-number: QTBUG-46255
Change-Id: I6b0d7ee8ee2d67ca0138eacdf0ad221338f788e4
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

2 files changed, 66 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickpathview/data/customAttribute.qml b/tests/auto/quick/qquickpathview/data/customAttribute.qml
new file mode 100644
index 0000000000..bd4c9fd1de
--- /dev/null
+++ b/tests/auto/quick/qquickpathview/data/customAttribute.qml
@@ -0,0 +1,58 @@
+import QtQuick 2.4
+
+PathView {
+    width: 200
+    height: 600
+
+    pathItemCount: 7
+
+    model: ListModel {
+        ListElement { color: "salmon" }
+        ListElement { color: "seagreen" }
+        ListElement { color: "navy" }
+        ListElement { color: "goldenrod" }
+    }
+    path: Path {
+        startX: width / 2; startY: -100
+        PathAttribute { name: "BEGIN" }
+
+        PathLine { relativeX: 0; y: height / 2 }
+        PathAttribute { name: "BEGIN" }
+
+        PathLine { relativeX: 0; y: height + 100 }
+        PathAttribute { name: "BEGIN" }
+    }
+    delegate: Rectangle {
+        width: 200
+        height: 200
+        color: model.color
+        opacity: PathView.transparency
+    }
+
+    Component {
+        id: attributeComponent
+        PathAttribute {}
+    }
+
+    function addAttribute(name, values) {
+        var valueIndex = 0
+        var elements = []
+        for (var i = 0; i < path.pathElements.length; ++i) {
+            elements.push(path.pathElements[i])
+
+            if (path.pathElements[i].name === "BEGIN") {
+                if (values[valueIndex] !== undefined) {
+                    var attribute = attributeComponent.createObject(this, { "name": name, "value": values[valueIndex] })
+                    elements.push(attribute)
+                }
+                ++valueIndex
+            }
+        }
+
+        console.log("??")
+        path.pathElements = elements
+        console.log("!!")
+    }
+
+    Component.onCompleted: addAttribute("transparency", [0, 1, 0])
+}
diff --git a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
index 0910f6cb2e..5636b312af 100644
--- a/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/quick/qquickpathview/tst_qquickpathview.cpp
@@ -141,6 +141,7 @@ private slots:
     void flickableDelegate();
     void jsArrayChange();
     void qtbug42716();
+    void addCustomAttribute();
 };
 
 class TestObject : public QObject
@@ -2371,6 +2372,13 @@ void tst_QQuickPathView::qtbug42716()
     QVERIFY(!itemMiss);
 }
 
+void tst_QQuickPathView::addCustomAttribute()
+{
+    const QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("customAttribute.qml"));
+    window->show();
+}
+
 QTEST_MAIN(tst_QQuickPathView)
 
 #include "tst_qquickpathview.moc"