diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-06-14 22:12:04 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2013-06-15 15:27:33 +0200 |
| commit | 6b71ae03f39229cc22739cc6336e93fb348741a5 (patch) | |
| tree | 611e27753fcb71e1057e8a3fe7975ef4fda058e5 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | b5932a162afc0faf126d79c323c4e028300f9074 (diff) | |
Re-enable two disabled var property tests and make them pass
When marking the var properties of a VME-metaobject (we decided to keep its
QObject alive), then we must also mark the var properties of the parent
VME-metaobject. The two property var inheritance tests verify that.
Change-Id: If1f0d4f3daef78d42adb7052cc1ce7bbdd6da585
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index 233533efb4..327b638068 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -1228,6 +1228,9 @@ void QQmlVMEMetaObject::mark() } } } + + if (QQmlVMEMetaObject *parent = parentVMEMetaObject()) + parent->mark(); } void QQmlVMEMetaObject::allocateVarPropertiesArray() |