From e81bd76e68ea818d7ea330bf7ae8f9a5fd4476ff Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 14 Feb 2023 14:48:53 +0100 Subject: 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 --- src/qml/compiler/qv4codegen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/qml/compiler/qv4codegen.cpp') 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(); -- cgit v1.2.3