diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/generateloader.cpp | 8 | ||||
| -rw-r--r-- | tools/qmlcachegen/qtquickcompiler.prf | 4 |
2 files changed, 1 insertions, 11 deletions
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_) |