diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2023-05-16 09:27:14 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2023-05-23 13:53:22 +0200 |
| commit | ba64b7a70eedf6a2023ef86eda542cad6f4b21be (patch) | |
| tree | 2a7663132b2717a2c361c3b0c03b09fe85fcc884 /src/qmlcompiler | |
| parent | 1559e6707e276b521b52876c539fcfe5a1e85a4e (diff) | |
Undeprecate AOTCompiledFunction
We're going to call the JavaScript-typed functions a different name.
Change-Id: If92c3fb1b16b1b0bd7d009e7dd712ae6405e1232
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/qmlcompiler')
| -rw-r--r-- | src/qmlcompiler/qqmljscompiler.cpp | 8 | ||||
| -rw-r--r-- | src/qmlcompiler/qqmljsloadergenerator.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index 63de0358ae..99d2e1c8d7 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -576,12 +576,12 @@ bool qSaveQmlJSUnitAsCpp(const QString &inputFileName, const QString &outputFile writeStr(aotFunctions[FileScopeCodeIndex].code.toUtf8().constData()); if (aotFunctions.size() <= 1) { // FileScopeCodeIndex is always there, but it may be the only one. - writeStr("extern const QQmlPrivate::TypedFunction aotBuiltFunctions[];\n" - "extern const QQmlPrivate::TypedFunction aotBuiltFunctions[] = { { 0, QMetaType::fromType<void>(), {}, nullptr } };"); + writeStr("extern const QQmlPrivate::AOTCompiledFunction aotBuiltFunctions[];\n" + "extern const QQmlPrivate::AOTCompiledFunction aotBuiltFunctions[] = { { 0, QMetaType::fromType<void>(), {}, nullptr } };"); } else { writeStr(wrapCallCode); - writeStr("extern const QQmlPrivate::TypedFunction aotBuiltFunctions[];\n" - "extern const QQmlPrivate::TypedFunction aotBuiltFunctions[] = {\n"); + writeStr("extern const QQmlPrivate::AOTCompiledFunction aotBuiltFunctions[];\n" + "extern const QQmlPrivate::AOTCompiledFunction aotBuiltFunctions[] = {\n"); QString footer = QStringLiteral("});}\n"); diff --git a/src/qmlcompiler/qqmljsloadergenerator.cpp b/src/qmlcompiler/qqmljsloadergenerator.cpp index 6e9fabbf60..494ecdadd0 100644 --- a/src/qmlcompiler/qqmljsloadergenerator.cpp +++ b/src/qmlcompiler/qqmljsloadergenerator.cpp @@ -110,7 +110,7 @@ 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::TypedFunction aotBuiltFunctions[];\n"; + stream << " extern const QQmlPrivate::AOTCompiledFunction aotBuiltFunctions[];\n"; stream << " const QQmlPrivate::CachedQmlUnit unit = {\n"; stream << " reinterpret_cast<const QV4::CompiledData::Unit*>(&qmlData), &aotBuiltFunctions[0], nullptr\n"; stream << " };\n"; |