diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-11-09 09:15:54 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-11-09 18:55:15 +0100 |
| commit | de6c7aa7340b96e8d1d480011dc11a1a094074e2 (patch) | |
| tree | 930c87a958c6e3428111d9f9735c379cc8ba6d27 /src/qml/compiler | |
| parent | 72af59ed52a9c6643f8f187524dfd775a82ab95e (diff) | |
Avoid conflicts with Windows headers
Windows COM headers #define interface struct, and we seem to have some
private includes pulling in a platform header, breaking builds.
Rename variables and parameters from 'interface' to 'iface'.
Pick-to: 6.2
Change-Id: I233a2b0f4a488129806a5ae05fa1080d29b36e0e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qqmlirbuilder_p.h | 2 | ||||
| -rw-r--r-- | src/qml/compiler/qv4codegen_p.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h index 036da04743..8555aedaca 100644 --- a/src/qml/compiler/qqmlirbuilder_p.h +++ b/src/qml/compiler/qqmlirbuilder_p.h @@ -599,7 +599,7 @@ private: struct Q_QMLCOMPILER_PRIVATE_EXPORT JSCodeGen : public QV4::Compiler::Codegen { JSCodeGen(Document *document, const QSet<QString> &globalNames, - QV4::Compiler::CodegenWarningInterface *interface = + QV4::Compiler::CodegenWarningInterface *iface = QV4::Compiler::defaultCodegenWarningInterface()); // Returns mapping from input functions to index in IR::Module::functions / compiledData->runtimeFunctions diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h index f773e3905f..16b5e02969 100644 --- a/src/qml/compiler/qv4codegen_p.h +++ b/src/qml/compiler/qv4codegen_p.h @@ -91,8 +91,8 @@ public: inline CodegenWarningInterface *defaultCodegenWarningInterface() { - static CodegenWarningInterface interface; - return &interface; + static CodegenWarningInterface iface; + return &iface; } class Q_QMLCOMPILER_PRIVATE_EXPORT Codegen: protected QQmlJS::AST::Visitor @@ -102,7 +102,7 @@ protected: using Instruction = QV4::Moth::Instruction; public: Codegen(QV4::Compiler::JSUnitGenerator *jsUnitGenerator, bool strict, - CodegenWarningInterface *interface = defaultCodegenWarningInterface()); + CodegenWarningInterface *iface = defaultCodegenWarningInterface()); void generateFromProgram(const QString &fileName, const QString &finalUrl, |