From 6ef66a5dfe938a23c67c0aef0d6c7ebc98b8cca8 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Tue, 23 Jan 2018 14:14:47 +0100
Subject: Remove private API dependency of qmlcachegen generated code

Since the compilation unit does not have a backend anymore, we can
create it in QtQml itself instead of in generated stub code. That
removes the last dependency to private headers in the generated code.

Change-Id: I186fc5bd679476b1a4714e4e3ba0ac00b55676cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tools/qmlcachegen/generateloader.cpp  | 8 +-------
 tools/qmlcachegen/qtquickcompiler.prf | 4 ----
 2 files changed, 1 insertion(+), 11 deletions(-)

(limited to 'tools')

diff --git a/tools/qmlcachegen/generateloader.cpp b/tools/qmlcachegen/generateloader.cpp
index dd2e244b56..083af29a2d 100644
--- a/tools/qmlcachegen/generateloader.cpp
+++ b/tools/qmlcachegen/generateloader.cpp
@@ -293,7 +293,6 @@ bool generateLoader(const QStringList &compiledFiles, const QString &outputFileN
     {
         QTextStream stream(&generatedLoaderCode);
         stream << "#include <QtQml/qqmlprivate.h>\n";
-        stream << "#include <private/qv4compileddata_p.h>\n";
         stream << "#include <QtCore/qdir.h>\n";
         stream << "#include <QtCore/qurl.h>\n";
         stream << "\n";
@@ -306,13 +305,8 @@ bool generateLoader(const QStringList &compiledFiles, const QString &outputFileN
             const QString ns = symbolNamespaceForPath(compiledFile);
             stream << "namespace " << symbolNamespaceForPath(compiledFile) << " { \n";
             stream << "    extern const unsigned char qmlData[];\n";
-            stream << "    QV4::CompiledData::CompilationUnit *createCompilationUnit() {\n";
-            stream << "        QV4::CompiledData::CompilationUnit *unit = new QV4::CompiledData::CompilationUnit;\n";
-            stream << "        unit->data = reinterpret_cast<const QV4::CompiledData::Unit*>(&qmlData);\n";
-            stream << "        return unit;\n";
-            stream << "    }\n";
             stream << "    const QQmlPrivate::CachedQmlUnit unit = {\n";
-            stream << "        reinterpret_cast<const QV4::CompiledData::Unit*>(&qmlData), &createCompilationUnit, nullptr\n";
+            stream << "        reinterpret_cast<const QV4::CompiledData::Unit*>(&qmlData), nullptr, nullptr\n";
             stream << "    };\n";
             stream << "}\n";
         }
diff --git a/tools/qmlcachegen/qtquickcompiler.prf b/tools/qmlcachegen/qtquickcompiler.prf
index 985a0a5cdc..b68e8f91a2 100644
--- a/tools/qmlcachegen/qtquickcompiler.prf
+++ b/tools/qmlcachegen/qtquickcompiler.prf
@@ -53,10 +53,6 @@ for(res, QMLCACHE_RESOURCE_FILES) {
     QMLCACHE_RESOURCE_FLAGS += --resource=$$res
 }
 
-!isEmpty(QMLCACHE_FILES) {
-    QT_PRIVATE *= core-private qml-private
-}
-
 defineReplace(qmlCacheOutputName) {
     name = $$absolute_path($$1, $$OUT_PWD)
     name = $$relative_path($$name, $$_PRO_FILE_PWD_)
-- 
cgit v1.2.3