diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2025-04-10 15:47:13 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2025-04-11 10:32:45 +0200 |
| commit | 25f08f305019e66e3b496f45167848c90d7a06fb (patch) | |
| tree | 74e749c87a6b1cc42179b6e3d2dc15a7aa14a966 | |
| parent | dbcadeac5a1f9205f322fa0c5dbc887baaacfe34 (diff) | |
QmlCompiler: Rename "unit" argument to the signature generator
It clashes with another "unit" in the same namespace.
Pick-to: 6.9 6.8
Fixes: QTBUG-134911
Change-Id: I4a6eca75fe688f1cf08633af6a68c4481178608d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
| -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 a3d666f83b..022ce525eb 100644 --- a/src/qmlcompiler/qqmljscodegenerator.cpp +++ b/src/qmlcompiler/qqmljscodegenerator.cpp @@ -267,7 +267,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 d1d966d2e7..3da68c758f 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -575,7 +575,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) |