aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-10-20 14:47:16 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-10-23 13:31:19 +0200
commitdb131539058aee18b65110fd2c42698e4894b05e (patch)
tree12614c4b3a69b3683f141c8df06a2528aebe3168 /src
parent2458f07eb568dc13f1f92b77adc047ef129a5636 (diff)
qmlcachegen: Add empty AOT built functions to the loader
This enables us to use the same generateloader.cpp for qmlcachegen and any replacement that actually produces AOT compiled functions. Change-Id: I12fe81236e4ef16a627729c644d54b6c171b3860 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qmlcompiler/qqmljsloadergenerator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qmlcompiler/qqmljsloadergenerator.cpp b/src/qmlcompiler/qqmljsloadergenerator.cpp
index bd560e6266..829b33dabb 100644
--- a/src/qmlcompiler/qqmljsloadergenerator.cpp
+++ b/src/qmlcompiler/qqmljsloadergenerator.cpp
@@ -133,8 +133,9 @@ bool qQmlJSGenerateLoader(const QStringList &compiledFiles, const QString &outpu
const QString ns = qQmlJSSymbolNamespaceForPath(compiledFile);
stream << "namespace " << ns << " { \n";
stream << " extern const unsigned char qmlData[];\n";
+ stream << " extern const QQmlPrivate::AOTCompiledFunction aotBuiltFunctions[];\n";
stream << " const QQmlPrivate::CachedQmlUnit unit = {\n";
- stream << " reinterpret_cast<const QV4::CompiledData::Unit*>(&qmlData), nullptr, nullptr\n";
+ stream << " reinterpret_cast<const QV4::CompiledData::Unit*>(&qmlData), &aotBuiltFunctions[0], nullptr\n";
stream << " };\n";
stream << "}\n";
}