Ensure PathView "attribute" attached properties are created correctly

If an item was created spontaneously (i.e. delegate is a package and
some other view created the item), ensure its attached properties are
correctly initialized.

Task-number: QTBUG-10527

5 files changed, 147 insertions, 12 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index 4d8b619..3d0df87 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -322,6 +322,17 @@ QPainterPath QDeclarativePath::path() const
 QStringList QDeclarativePath::attributes() const
 {
     Q_D(const QDeclarativePath);
+    if (!d->componentComplete) {
+        QSet<QString> attrs;
+
+        // First gather up all the attributes
+        foreach (QDeclarativePathElement *pathElement, d->_pathElements) {
+            if (QDeclarativePathAttribute *attribute =
+                qobject_cast<QDeclarativePathAttribute *>(pathElement))
+                attrs.insert(attribute->name());
+        }
+        return attrs.toList();
+    }
     return d->_attributes;
 }
 
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 040fc98..503d096 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -98,9 +98,8 @@ QDeclarativeItem *QDeclarativePathViewPrivate::getItem(int modelIndex)
         if (!attType) {
             // pre-create one metatype to share with all attached objects
             attType = new QDeclarativeOpenMetaObjectType(&QDeclarativePathViewAttached::staticMetaObject, qmlEngine(q));
-            foreach(const QString &attr, path->attributes()) {
+            foreach(const QString &attr, path->attributes())
                 attType->createProperty(attr.toUtf8());
-            }
         }
         qPathViewAttachedType = attType;
         QDeclarativePathViewAttached *att = static_cast<QDeclarativePathViewAttached *>(qmlAttachedPropertiesObject<QDeclarativePathView>(item));
@@ -418,7 +417,7 @@ void QDeclarativePathView::setModel(const QVariant &model)
         d->model = vim;
     } else {
         if (!d->ownModel) {
-            d->model = new QDeclarativeVisualDataModel(qmlContext(this));
+            d->model = new QDeclarativeVisualDataModel(qmlContext(this), this);
             d->ownModel = true;
         }
         if (QDeclarativeVisualDataModel *dataModel = qobject_cast<QDeclarativeVisualDataModel*>(d->model))
@@ -471,12 +470,14 @@ void QDeclarativePathView::setPath(QDeclarativePath *path)
         disconnect(d->path, SIGNAL(changed()), this, SLOT(refill()));
     d->path = path;
     connect(d->path, SIGNAL(changed()), this, SLOT(refill()));
-    d->clear();
-    if (d->attType) {
-        d->attType->release();
-        d->attType = 0;
+    if (d->isValid() && isComponentComplete()) {
+        d->clear();
+        if (d->attType) {
+            d->attType->release();
+            d->attType = 0;
+        }
+        d->regenerate();
     }
-    d->regenerate();
     emit pathChanged();
 }
 
@@ -1119,7 +1120,8 @@ void QDeclarativePathView::refill()
         while ((pos > startPos || !d->items.count()) && d->items.count() < count) {
 //            qDebug() << "append" << idx;
             QDeclarativeItem *item = d->getItem(idx);
-            item->setZValue(idx+1);
+            if (d->model->completePending())
+                item->setZValue(idx+1);
             if (d->currentIndex == idx) {
                 item->setFocus(true);
                 if (QDeclarativePathViewAttached *att = d->attached(item))
@@ -1132,7 +1134,8 @@ void QDeclarativePathView::refill()
                 d->firstIndex = idx;
             d->items.append(item);
             d->updateItem(item, pos);
-            d->model->completeItem();
+            if (d->model->completePending())
+                d->model->completeItem();
             ++idx;
             if (idx >= d->model->count())
                 idx = 0;
@@ -1146,7 +1149,8 @@ void QDeclarativePathView::refill()
         while (pos >= 0.0 && pos < startPos) {
 //            qDebug() << "prepend" << idx;
             QDeclarativeItem *item = d->getItem(idx);
-            item->setZValue(idx+1);
+            if (d->model->completePending())
+                item->setZValue(idx+1);
             if (d->currentIndex == idx) {
                 item->setFocus(true);
                 if (QDeclarativePathViewAttached *att = d->attached(item))
@@ -1157,7 +1161,8 @@ void QDeclarativePathView::refill()
             }
             d->items.prepend(item);
             d->updateItem(item, pos);
-            d->model->completeItem();
+            if (d->model->completePending())
+                d->model->completeItem();
             d->firstIndex = idx;
             idx = d->firstIndex - 1;
             if (idx < 0)
@@ -1269,6 +1274,19 @@ void QDeclarativePathView::createdItem(int index, QDeclarativeItem *item)
 {
     Q_D(QDeclarativePathView);
     if (d->requestedIndex != index) {
+        if (!d->attType) {
+            // pre-create one metatype to share with all attached objects
+            d->attType = new QDeclarativeOpenMetaObjectType(&QDeclarativePathViewAttached::staticMetaObject, qmlEngine(this));
+            foreach(const QString &attr, d->path->attributes())
+                d->attType->createProperty(attr.toUtf8());
+        }
+        qPathViewAttachedType = d->attType;
+        QDeclarativePathViewAttached *att = static_cast<QDeclarativePathViewAttached *>(qmlAttachedPropertiesObject<QDeclarativePathView>(item));
+        qPathViewAttachedType = 0;
+        if (att) {
+            att->m_view = this;
+            att->setOnPath(false);
+        }
         item->setParentItem(this);
         d->updateItem(item, index < d->firstIndex ? 0.0 : 1.0);
     }
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p.h
index 7240578..85f47fd 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p.h
@@ -215,6 +215,7 @@ Q_SIGNALS:
 
 private:
     friend class QDeclarativePathViewPrivate;
+    friend class QDeclarativePathView;
     QDeclarativePathView *m_view;
     QDeclarativeOpenMetaObject *m_metaobject;
     bool m_onPath : 1;
diff --git a/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml b/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
new file mode 100644
index 0000000..082da13
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/pathview_package.qml
@@ -0,0 +1,88 @@
+import Qt 4.7
+
+Item {
+    width: 800; height: 600
+    Component {
+        id: photoDelegate
+        Package {
+            Item { id: pathItem; objectName: "pathItem"; Package.name: 'path'; width: 85; height: 85; scale: pathItem.PathView.scale }
+            Item { id: linearItem; Package.name: 'linear'; width: 85; height: 85 }
+            Rectangle {
+                id: wrapper
+                width: 85; height: 85; color: lColor
+
+                transform: Rotation {
+                    id: itemRotation; origin.x: wrapper.width/2; origin.y: wrapper.height/2
+                    axis.y: 1; axis.z: 0
+                }
+                state: 'path'
+                states: [
+                    State {
+                        name: 'path'
+                        ParentChange { target: wrapper; parent: pathItem; x: 0; y: 0 }
+                        PropertyChanges { target: wrapper; opacity: pathItem.PathView.onPath ? 1.0 : 0 }
+                    }
+                ]
+            }
+        }
+    }
+    ListModel {
+        id: rssModel
+        ListElement { lColor: "red" }
+        ListElement { lColor: "green" }
+        ListElement { lColor: "yellow" }
+        ListElement { lColor: "blue" }
+        ListElement { lColor: "purple" }
+        ListElement { lColor: "gray" }
+        ListElement { lColor: "brown" }
+        ListElement { lColor: "thistle" }
+    }
+    VisualDataModel { id: visualModel; model: rssModel; delegate: photoDelegate }
+
+    PathView {
+        id: photoPathView
+        objectName: "photoPathView"
+        width: 800; height: 330; pathItemCount: 4; offset: 1
+        dragMargin: 24
+        preferredHighlightBegin: 0.50
+        preferredHighlightEnd: 0.50
+
+        path: Path {
+            startX: -50; startY: 40;
+
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: -45 }
+
+            PathCubic {
+                x: 400; y: 220
+                control1X: 140; control1Y: 40
+                control2X: 210; control2Y: 220
+            }
+
+            PathAttribute { name: "scale"; value: 1.2  }
+            PathAttribute { name: "angle"; value: 0 }
+
+            PathCubic {
+                x: 850; y: 40
+                control2X: 660; control2Y: 40
+                control1X: 590; control1Y: 220
+            }
+
+            PathAttribute { name: "scale"; value: 0.5 }
+            PathAttribute { name: "angle"; value: 45 }
+        }
+
+        model: visualModel.parts.path
+    }
+
+    PathView {
+        y: 400; width: 800; height: 330; pathItemCount: 8
+
+        path: Path {
+            startX: 0; startY: 40;
+            PathLine { x: 800; y: 40 }
+        }
+
+        model: visualModel.parts.linear
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index c32e9cc..62d0b89 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -78,6 +78,7 @@ private slots:
     void componentChanges();
     void modelChanges();
     void pathUpdateOnStartChanged();
+    void package();
 
 
 private:
@@ -695,6 +696,22 @@ void tst_QDeclarativePathView::pathUpdateOnStartChanged()
     delete canvas;
 }
 
+void tst_QDeclarativePathView::package()
+{
+    QDeclarativeView *canvas = createView();
+    QVERIFY(canvas);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pathview_package.qml"));
+
+    QDeclarativePathView *pathView = canvas->rootObject()->findChild<QDeclarativePathView*>("photoPathView");
+    QVERIFY(pathView);
+
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(pathView, "pathItem");
+    QVERIFY(item);
+    QVERIFY(item->scale() != 1.0);
+
+    delete canvas;
+}
+
 QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);