aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@digia.com>2012-11-05 13:51:58 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-05 15:17:31 +0100
commit0b019fcc52560d0a7016f733cb2bea3e03893ec0 (patch)
tree9c44639d2cec59538ecdbbf3fd5d710b4543ea0e
parentb01ed0bb882746f57eae3923bcd1cf8c2bd303f7 (diff)
QQmlPropertyCache: adding setParent()
setParent() enables to dynamically set the parent of a QQmlPropertyCache. This is used in the Qt Quick Designer to create dynamic properties on an arbitrary object. Change-Id: I0dafabcacf4222fc1bfe693736cbd23e1e928e8f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Marco Bubke <marco.bubke@digia.com>
-rw-r--r--src/qml/qml/qqmlpropertycache.cpp5
-rw-r--r--src/qml/qml/qqmlpropertycache_p.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index c1c4a6c03d..8b023855ab 100644
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -549,6 +549,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 14be99045f..2804f66dbe 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -294,6 +294,7 @@ public:
QString defaultPropertyName() const;
QQmlPropertyData *defaultProperty() const;
QQmlPropertyCache *parent() const;
+ void setParent(QQmlPropertyCache *newParent);
inline QQmlPropertyData *overrideData(QQmlPropertyData *) const;
inline bool isAllowedInRevision(QQmlPropertyData *) const;