diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-06-04 12:29:53 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2025-06-04 16:27:59 +0200 |
| commit | 303556c1dfb2d0e8e5d873cd59f5fee248a709fe (patch) | |
| tree | d6564201962f5e2052e177d75eb00d1e4249fd49 /src | |
| parent | f5140d62082e9b06e0ca6c8e2175b5836286f52e (diff) | |
QML compiler: Fix Unity build on Windows
Somehow, qt_windows.h gets in the mix which has the 'interface' define.
Rename the variable.
Pick-to: 6.10 6.9
Task-number: QTBUG-115140
Change-Id: I6d46d66d0db3350a975984bcc6c4858214615c8b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmlcompiler/qqmljscompiler.cpp | 8 | ||||
| -rw-r--r-- | src/qmlcompiler/qqmljscompiler_p.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index 6f7be49dcd..c04ba26aa1 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -171,18 +171,18 @@ private: bool qCompileQmlFile(const QString &inputFileName, QQmlJSSaveFunction saveFunction, QQmlJSAotCompiler *aotCompiler, QQmlJSCompileError *error, - bool storeSourceLocation, QV4::Compiler::CodegenWarningInterface *interface, + bool storeSourceLocation, QV4::Compiler::CodegenWarningInterface *wInterface, const QString *fileContents) { QmlIR::Document irDocument(QString(), QString(), /*debugMode*/false); return qCompileQmlFile(irDocument, inputFileName, saveFunction, aotCompiler, error, - storeSourceLocation, interface, fileContents); + storeSourceLocation, wInterface, fileContents); } bool qCompileQmlFile(QmlIR::Document &irDocument, const QString &inputFileName, QQmlJSSaveFunction saveFunction, QQmlJSAotCompiler *aotCompiler, QQmlJSCompileError *error, bool storeSourceLocation, - QV4::Compiler::CodegenWarningInterface *interface, const QString *fileContents) + QV4::Compiler::CodegenWarningInterface *wInterface, const QString *fileContents) { QString sourceCode; @@ -213,7 +213,7 @@ bool qCompileQmlFile(QmlIR::Document &irDocument, const QString &inputFileName, QQmlJSAotFunctionMap aotFunctionsByIndex; { - QmlIR::JSCodeGen v4CodeGen(&irDocument, interface, storeSourceLocation); + QmlIR::JSCodeGen v4CodeGen(&irDocument, wInterface, storeSourceLocation); if (aotCompiler) aotCompiler->setDocument(&v4CodeGen, &irDocument); diff --git a/src/qmlcompiler/qqmljscompiler_p.h b/src/qmlcompiler/qqmljscompiler_p.h index e4e3a0511a..51ad2fd4f5 100644 --- a/src/qmlcompiler/qqmljscompiler_p.h +++ b/src/qmlcompiler/qqmljscompiler_p.h @@ -119,15 +119,15 @@ bool Q_QMLCOMPILER_EXPORT qCompileQmlFile(const QString &inputFileName, QQmlJSSaveFunction saveFunction, QQmlJSAotCompiler *aotCompiler, QQmlJSCompileError *error, bool storeSourceLocation = false, - QV4::Compiler::CodegenWarningInterface *interface = + QV4::Compiler::CodegenWarningInterface *wInterface = QV4::Compiler::defaultCodegenWarningInterface(), const QString *fileContents = nullptr); bool Q_QMLCOMPILER_EXPORT qCompileQmlFile(QmlIR::Document &irDocument, const QString &inputFileName, QQmlJSSaveFunction saveFunction, QQmlJSAotCompiler *aotCompiler, QQmlJSCompileError *error, bool storeSourceLocation = false, - QV4::Compiler::CodegenWarningInterface *interface = - QV4::Compiler::defaultCodegenWarningInterface(), + QV4::Compiler::CodegenWarningInterface *wInterface = + QV4::Compiler::defaultCodegenWarningInterface(), const QString *fileContents = nullptr); bool Q_QMLCOMPILER_EXPORT qCompileJSFile(const QString &inputFileName, const QString &inputFileUrl, QQmlJSSaveFunction saveFunction, |