Revert partially "Remove some unused code and forward declarations"
authorMarco Bubke <marco.bubke@digia.com>
Thu, 18 Jul 2013 09:40:54 +0000 (11:40 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 18 Jul 2013 09:57:08 +0000 (11:57 +0200)
The setParent function was used by the qml designer!

This reverts commit 8cb3b016885a861fcd2af24e559e768eabecc3ae.

Change-Id: Id6236f5f27d0bf997c5670f3431cfd43721f380b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
src/qml/qml/qqmlpropertycache.cpp
src/qml/qml/qqmlpropertycache_p.h

index aee24bb..d200008 100644 (file)
@@ -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
index e70c89c..daba6e8 100644 (file)
@@ -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;