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/qqmlinstruction_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/qqmlinstruction_p.h')
| -rw-r--r-- | src/qml/qml/qqmlinstruction_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlinstruction_p.h b/src/qml/qml/qqmlinstruction_p.h index bd279d66d8..8b7dc383f8 100644 --- a/src/qml/qml/qqmlinstruction_p.h +++ b/src/qml/qml/qqmlinstruction_p.h @@ -200,6 +200,7 @@ union QQmlInstruction ushort column; ushort line; bool isRoot; + bool parentToSuper; }; struct instr_createSimple { QML_INSTR_HEADER @@ -208,6 +209,7 @@ union QQmlInstruction int type; ushort column; ushort line; + bool parentToSuper; }; struct instr_storeMeta { QML_INSTR_HEADER @@ -222,13 +224,11 @@ union QQmlInstruction struct instr_assignValueSource { QML_INSTR_HEADER QQmlPropertyRawData property; - int owner; int castValue; }; struct instr_assignValueInterceptor { QML_INSTR_HEADER QQmlPropertyRawData property; - int owner; int castValue; }; struct instr_initV8Bindings { |