Merge remote-tracking branch 'origin/dev' into wip/scenegraphng

Change-Id: Ie7dbc5a7d9eccd1613283134a1b47ab597d036d5

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/qml/qqmlcontext_p.h b/src/qml/qml/qqmlcontext_p.h
index 7e3cef8e1d..1ddd04c9ff 100644
--- a/src/qml/qml/qqmlcontext_p.h
+++ b/src/qml/qml/qqmlcontext_p.h
@@ -66,7 +66,7 @@
 #include <private/qflagpointer_p.h>
 #include <private/qqmlguard_p.h>
 
-#include <private/qv4compileddata_p.h>
+#include <private/qv4executablecompilationunit_p.h>
 #include <private/qv4identifier_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -152,12 +152,12 @@ public:
     QQmlIncubatorPrivate *incubator;
 
     // Compilation unit for contexts that belong to a compiled type.
-    QQmlRefPointer<QV4::CompiledData::CompilationUnit> typeCompilationUnit;
+    QQmlRefPointer<QV4::ExecutableCompilationUnit> typeCompilationUnit;
 
     // object index in CompiledData::Unit to component that created this context
     int componentObjectIndex;
 
-    void initFromTypeCompilationUnit(const QQmlRefPointer<QV4::CompiledData::CompilationUnit> &unit, int subComponentIndex);
+    void initFromTypeCompilationUnit(const QQmlRefPointer<QV4::ExecutableCompilationUnit> &unit, int subComponentIndex);
 
     // flag indicates whether the context owns the cache (after mutation) or not.
     mutable QV4::IdentifierHash propertyNameCache;