Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 11 insertions, 10 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.h b/src/declarative/graphicsitems/qmlgraphicsitem.h
index 11d6e2e..d092896 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.h
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.h
@@ -157,6 +157,14 @@ public:
     bool keepMouseGrab() const;
     void setKeepMouseGrab(bool);
 
+    QmlGraphicsAnchorLine left() const;
+    QmlGraphicsAnchorLine right() const;
+    QmlGraphicsAnchorLine horizontalCenter() const;
+    QmlGraphicsAnchorLine top() const;
+    QmlGraphicsAnchorLine bottom() const;
+    QmlGraphicsAnchorLine verticalCenter() const;
+    QmlGraphicsAnchorLine baseline() const;
+
 Q_SIGNALS:
     void widthChanged();
     void heightChanged();
@@ -193,15 +201,6 @@ protected:
     QmlGraphicsItem(QmlGraphicsItemPrivate &dd, QmlGraphicsItem *parent = 0);
 
 private:
-    // ### public?
-    QmlGraphicsAnchorLine left() const;
-    QmlGraphicsAnchorLine right() const;
-    QmlGraphicsAnchorLine horizontalCenter() const;
-    QmlGraphicsAnchorLine top() const;
-    QmlGraphicsAnchorLine bottom() const;
-    QmlGraphicsAnchorLine verticalCenter() const;
-    QmlGraphicsAnchorLine baseline() const;
-
     friend class QmlStatePrivate;
     friend class QmlGraphicsAnchors;
     Q_DISABLE_COPY(QmlGraphicsItem)
diff --git a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
index 48758a7..7aed760 100644
--- a/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsrepeater.cpp
@@ -266,8 +266,10 @@ void QmlGraphicsRepeater::clear()
 {
     Q_D(QmlGraphicsRepeater);
     if (d->model) {
-        foreach (QmlGraphicsItem *item, d->deletables)
+        foreach (QmlGraphicsItem *item, d->deletables) {
+            item->setParentItem(this);
             d->model->release(item);
+        }
     }
     d->deletables.clear();
 }