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

1 files changed, 4 insertions, 2 deletions

diff --git a/src/qml/qml/qqmlmetatype_p.h b/src/qml/qml/qqmlmetatype_p.h
index 9af982d1c3..911e519cf2 100644
--- a/src/qml/qml/qqmlmetatype_p.h
+++ b/src/qml/qml/qqmlmetatype_p.h
@@ -61,6 +61,8 @@ class QQmlTypeModule;
 class QMutex;
 class QQmlError;
 
+namespace QV4 { class ExecutableCompilationUnit; }
+
 class Q_QML_PRIVATE_EXPORT QQmlMetaType
 {
 public:
@@ -78,8 +80,8 @@ public:
 
     static void unregisterType(int type);
 
-    static void registerInternalCompositeType(QV4::CompiledData::CompilationUnit *compilationUnit);
-    static void unregisterInternalCompositeType(QV4::CompiledData::CompilationUnit *compilationUnit);
+    static void registerInternalCompositeType(QV4::ExecutableCompilationUnit *compilationUnit);
+    static void unregisterInternalCompositeType(QV4::ExecutableCompilationUnit *compilationUnit);
 
     static void registerModule(const char *uri, int versionMajor, int versionMinor);
     static bool protectModule(const char *uri, int majVersion);