diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-05-24 16:28:54 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-06 16:51:07 +0200 |
| commit | a26d7aef3ce61ac0515cf8a324c8badd13bdb017 (patch) | |
| tree | 1dd22962a7c40df451ae7f9465cf2ca4e4185cb7 /src/qml/qml/qqmldata_p.h | |
| parent | 1fcb3d512c37625e6dfdbd045c755e8d6aca8c57 (diff) | |
Disallow parent changes for QML created objects
Currently this is protected with a QML_PARENT_TEST environment variable
to allow the rest of QtQuick to be updated before it is enforced.
Change-Id: I4dd3644cbbce91d67f24c9556637f97eafb00638
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmldata_p.h')
| -rw-r--r-- | src/qml/qml/qqmldata_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h index eba2f4df6e..879d59722b 100644 --- a/src/qml/qml/qqmldata_p.h +++ b/src/qml/qml/qqmldata_p.h @@ -80,7 +80,7 @@ public: QQmlData() : ownMemory(true), ownContext(false), indestructible(true), explicitIndestructibleSet(false), hasTaintedV8Object(false), isQueuedForDeletion(false), rootObjectInCreation(false), - hasVMEMetaObject(false), notifyList(0), context(0), outerContext(0), + hasVMEMetaObject(false), parentFrozen(false), notifyList(0), context(0), outerContext(0), bindings(0), signalHandlers(0), nextContextObject(0), prevContextObject(0), bindingBitsSize(0), bindingBits(0), lineNumber(0), columnNumber(0), compiledData(0), deferredIdx(0), v8objectid(0), propertyCache(0), guards(0), extendedData(0) { @@ -122,7 +122,8 @@ public: */ quint32 rootObjectInCreation:1; quint32 hasVMEMetaObject:1; - quint32 dummy:24; + quint32 parentFrozen:1; + quint32 dummy:23; struct NotifyList { quint64 connectionMask; |