From: Marco Bubke <marco.bubke@digia.com>
Date: Thu, 18 Jul 2013 09:40:54 +0000 (+0200)
Subject: Revert partially "Remove some unused code and forward declarations"
X-Git-Tag: upstream/5.2.1~669^2~66
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=000b6330d4ca7165ff241b21ee728ed28d82fba1;p=platform%2Fupstream%2Fqtdeclarative.git

Revert partially "Remove some unused code and forward declarations"

The setParent function was used by the qml designer!

This reverts commit 8cb3b016885a861fcd2af24e559e768eabecc3ae.

Change-Id: Id6236f5f27d0bf997c5670f3431cfd43721f380b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index aee24bb..d200008 100644
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -540,6 +540,11 @@ QQmlPropertyCache *QQmlPropertyCache::parent() const
     return _parent;
 }
 
+void QQmlPropertyCache::setParent(QQmlPropertyCache *newParent)
+{
+    _parent = newParent;
+}
+
 // Returns the first C++ type's QMetaObject - that is, the first QMetaObject not created by
 // QML
 const QMetaObject *QQmlPropertyCache::firstCppMetaObject() const
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index e70c89c..daba6e8 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -295,6 +295,8 @@ public:
     QString defaultPropertyName() const;
     QQmlPropertyData *defaultProperty() const;
     QQmlPropertyCache *parent() const;
+    // is used by the Qml Designer
+    void setParent(QQmlPropertyCache *newParent);
 
     inline QQmlPropertyData *overrideData(QQmlPropertyData *) const;
     inline bool isAllowedInRevision(QQmlPropertyData *) const;