diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-14 14:48:53 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-15 14:04:44 +0100 |
| commit | e81bd76e68ea818d7ea330bf7ae8f9a5fd4476ff (patch) | |
| tree | 64a677a6136cb41f86afdea209ab2ff66cbb32f8 | |
| parent | 82cda71298e3eea40f7379b412b0a36fe401b48a (diff) | |
Fix CMake Unity (Jumbo) builds on Windows
Rename some variables to prevent clashes with the "interface"
on Windows.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I54cd35c2d06b30c21cddd8650282687ec8ccf5ee
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder.cpp | 4 | ||||
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp index 3fd66d302c..6b2f795daf 100644 --- a/src/qml/compiler/qqmlirbuilder.cpp +++ b/src/qml/compiler/qqmlirbuilder.cpp @@ -1951,9 +1951,9 @@ char *QmlUnitGenerator::writeBindings(char *bindingPtr, const Object *o, Binding } JSCodeGen::JSCodeGen(Document *document, const QSet<QString> &globalNames, - QV4::Compiler::CodegenWarningInterface *interface, + QV4::Compiler::CodegenWarningInterface *iface, bool storeSourceLocations) - : QV4::Compiler::Codegen(&document->jsGenerator, /*strict mode*/ false, interface, + : QV4::Compiler::Codegen(&document->jsGenerator, /*strict mode*/ false, iface, storeSourceLocations), document(document) { diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index 157f831bb8..5df9b3fa4c 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -92,7 +92,7 @@ void Codegen::generateThrowException(const QString &type, const QString &text) } Codegen::Codegen(QV4::Compiler::JSUnitGenerator *jsUnitGenerator, bool strict, - CodegenWarningInterface *interface, bool storeSourceLocations) + CodegenWarningInterface *iface, bool storeSourceLocations) : _module(nullptr), _returnAddress(-1), _context(nullptr), @@ -101,7 +101,7 @@ Codegen::Codegen(QV4::Compiler::JSUnitGenerator *jsUnitGenerator, bool strict, _strictMode(strict), storeSourceLocations(storeSourceLocations), _fileNameIsUrl(false), - _interface(interface) + _interface(iface) { jsUnitGenerator->codeGeneratorName = QStringLiteral("moth"); pushExpr(); |