aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlcomponent.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-01-31 13:25:09 +0100
committerLars Knoll <lars.knoll@qt.io>2017-03-09 08:58:31 +0000
commit518e258d59adc976e2e8aa9a7f9ef36d8b8cdb66 (patch)
tree33b90cb45ebfa4cb6767db85caaafcf6ac83d404 /src/qml/qml/qqmlcomponent.cpp
parent8b3cbc4403e3eac286613691c11aa1ded588da59 (diff)
Make every member of a Heap object aware of its offset inside the object
This will allow adding a write barrier to those fields with manageable effort. Change-Id: I7d06d7ffccbcefe66e2524c64c962353c91c2766 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
-rw-r--r--src/qml/qml/qqmlcomponent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp
index 79e52f3914..c1a0637d00 100644
--- a/src/qml/qml/qqmlcomponent.cpp
+++ b/src/qml/qml/qqmlcomponent.cpp
@@ -1047,8 +1047,8 @@ namespace QV4 {
namespace Heap {
#define QmlIncubatorObjectMembers(class, Member) \
- Member(class, Value, Value, valuemap) \
- Member(class, Value, Value, statusChanged) \
+ Member(class, HeapValue, HeapValue, valuemap) \
+ Member(class, HeapValue, HeapValue, statusChanged) \
Member(class, Pointer, QmlContext *, qmlContext) \
Member(class, NoMark, QQmlComponentIncubator *, incubator) \
Member(class, NoMark, QQmlQPointer<QObject>, parent)