diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-04-10 15:47:13 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-04-11 19:18:30 +0000 |
| commit | 9500c23348886d3dae64b8fa2305bfab517aac12 (patch) | |
| tree | ee40d2cbc1317968c339b0c6970d4c1d9c09b2a6 | |
| parent | abded8778b2f0c0189130256a1ddce5089f3fdc3 (diff) | |
QmlCompiler: Rename "unit" argument to the signature generator
It clashes with another "unit" in the same namespace.
Fixes: QTBUG-134911
Change-Id: I4a6eca75fe688f1cf08633af6a68c4481178608d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit 25f08f305019e66e3b496f45167848c90d7a06fb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 7b5b011bae972c2634accd8b81aa10b03bb4c04f)
| -rw-r--r-- | src/qmlcompiler/qqmljscodegenerator.cpp | 2 | ||||
| -rw-r--r-- | src/qmlcompiler/qqmljscompiler.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp b/src/qmlcompiler/qqmljscodegenerator.cpp index ae146d244c..433fa1c082 100644 --- a/src/qmlcompiler/qqmljscodegenerator.cpp +++ b/src/qmlcompiler/qqmljscodegenerator.cpp @@ -270,7 +270,7 @@ QT_WARNING_POP QString signature - = u" struct { QV4::ExecutableCompilationUnit *compilationUnit; } c { unit };\n" + = u" struct { QV4::ExecutableCompilationUnit *compilationUnit; } c { contextUnit };\n" " const auto *aotContext = &c;\n" " Q_UNUSED(aotContext);\n"_s; diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index 26502f2047..4ed00d0944 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -582,7 +582,7 @@ bool qSaveQmlJSUnitAsCpp(const QString &inputFileName, const QString &outputFile const QString function = QString::fromUtf8(funcHeaderCode) + func.value().code + footer; - writeStr(QStringLiteral("{ %1, %2, [](QV4::ExecutableCompilationUnit *unit, " + writeStr(QStringLiteral("{ %1, %2, [](QV4::ExecutableCompilationUnit *contextUnit, " "QMetaType *argTypes) {\n%3}, %4 },") .arg(func.key()) .arg(func->numArguments) |