diff options
| author | Marco Bubke <marco.bubke@digia.com> | 2013-07-18 11:40:54 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-18 11:57:08 +0200 |
| commit | 000b6330d4ca7165ff241b21ee728ed28d82fba1 (patch) | |
| tree | a706a2dd05ecb82f3f57eea65f271ae0d8639adc /src/qml/qml | |
| parent | a96a1fe82b4db0d84f9b0dbc96d5e22464bc0ab7 (diff) | |
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>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 5 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index aee24bb028..d2000081a7 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 e70c89ced2..daba6e856d 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; |