1 files changed, 7 insertions, 13 deletions
diff --git a/src/qml/qml/qqmldata_p.h b/src/qml/qml/qqmldata_p.h
index 04c42b638d..ef05dd1fd7 100644
--- a/src/qml/qml/qqmldata_p.h
+++ b/src/qml/qml/qqmldata_p.h
@@ -48,8 +48,9 @@
 #include <private/qtqmlglobal_p.h>
 #include <private/qobject_p.h>
 
-#include <private/qv4value_inl_p.h>
+#include <private/qv4value_p.h>
 #include <private/qv4persistent_p.h>
+#include <qjsengine.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +59,7 @@ class QQmlEngine;
 class QQmlGuardImpl;
 class QQmlCompiledData;
 class QQmlAbstractBinding;
-class QQmlAbstractBoundSignal;
+class QQmlBoundSignal;
 class QQmlContext;
 class QQmlPropertyCache;
 class QQmlContextData;
@@ -72,15 +73,7 @@ class QQmlNotifierEndpoint;
 class Q_QML_PRIVATE_EXPORT QQmlData : public QAbstractDeclarativeData
 {
 public:
-    QQmlData()
-        : ownedByQml1(false), ownMemory(true), ownContext(false), indestructible(true), explicitIndestructibleSet(false),
-          hasTaintedV4Object(false), isQueuedForDeletion(false), rootObjectInCreation(false),
-          hasVMEMetaObject(false), parentFrozen(false), bindingBitsSize(0), bindingBits(0), notifyList(0), context(0), outerContext(0),
-          bindings(0), signalHandlers(0), nextContextObject(0), prevContextObject(0),
-          lineNumber(0), columnNumber(0), jsEngineId(0), compiledData(0), deferredData(0),
-          propertyCache(0), guards(0), extendedData(0) {
-        init();
-    }
+    QQmlData();
 
     static inline void init() {
         static bool initialized = false;
@@ -119,9 +112,10 @@ public:
      * v8 GC will check this flag, only deletes the objects when rootObjectInCreation is false.
      */
     quint32 rootObjectInCreation:1;
+    quint32 hasInterceptorMetaObject:1;
     quint32 hasVMEMetaObject:1;
     quint32 parentFrozen:1;
-    quint32 dummy:22;
+    quint32 dummy:21;
 
     // When bindingBitsSize < 32, we store the binding bit flags inside
     // bindingBitsValue. When we need more than 32 bits, we allocated
@@ -158,7 +152,7 @@ public:
     QQmlContextData *outerContext;
 
     QQmlAbstractBinding *bindings;
-    QQmlAbstractBoundSignal *signalHandlers;
+    QQmlBoundSignal *signalHandlers;
 
     // Linked list for QQmlContext::contextObjects
     QQmlData *nextContextObject;