qml: Rename Q_QMLCOMPILER_EXPORT to Q_QML_COMPILER_EXPORT

Otherwise we are in conflict with the export macro of the qmlcompiler
library.

Change-Id: Ic0f647a6708bc4c0b32ee63a684d56c4fbfca2a7
Reviewed-by: Fabian Kosmale <[email protected]>

8 files changed, 19 insertions, 19 deletions

diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 213d43134a..80376a2834 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -306,7 +306,7 @@ struct Function
     Function *next;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT CompiledFunctionOrExpression
+struct Q_QML_COMPILER_PRIVATE_EXPORT CompiledFunctionOrExpression
 {
     CompiledFunctionOrExpression()
     {}
@@ -317,7 +317,7 @@ struct Q_QMLCOMPILER_PRIVATE_EXPORT CompiledFunctionOrExpression
     CompiledFunctionOrExpression *next = nullptr;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT Object
+struct Q_QML_COMPILER_PRIVATE_EXPORT Object
 {
     Q_DECLARE_TR_FUNCTIONS(Object)
 public:
@@ -406,7 +406,7 @@ private:
     PoolList<RequiredPropertyExtraData> *requiredPropertyExtraDatas;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT Pragma
+struct Q_QML_COMPILER_PRIVATE_EXPORT Pragma
 {
     enum PragmaType
     {
@@ -430,7 +430,7 @@ struct Q_QMLCOMPILER_PRIVATE_EXPORT Pragma
     QV4::CompiledData::Location location;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT Document
+struct Q_QML_COMPILER_PRIVATE_EXPORT Document
 {
     Document(bool debugMode);
     QString code;
@@ -451,7 +451,7 @@ struct Q_QMLCOMPILER_PRIVATE_EXPORT Document
     Object* objectAt(int i) const {return objects.at(i);}
 };
 
-class Q_QMLCOMPILER_PRIVATE_EXPORT ScriptDirectivesCollector : public QQmlJS::Directives
+class Q_QML_COMPILER_PRIVATE_EXPORT ScriptDirectivesCollector : public QQmlJS::Directives
 {
     QmlIR::Document *document;
     QQmlJS::Engine *engine;
@@ -465,7 +465,7 @@ public:
     void importModule(const QString &uri, const QString &version, const QString &module, int lineNumber, int column) override;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT IRBuilder : public QQmlJS::AST::Visitor
+struct Q_QML_COMPILER_PRIVATE_EXPORT IRBuilder : public QQmlJS::AST::Visitor
 {
     Q_DECLARE_TR_FUNCTIONS(QQmlCodeGenerator)
 public:
@@ -587,7 +587,7 @@ public:
     bool insideInlineComponent = false;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT QmlUnitGenerator
+struct Q_QML_COMPILER_PRIVATE_EXPORT QmlUnitGenerator
 {
     void generate(Document &output, const QV4::CompiledData::DependentTypesHasher &dependencyHasher = QV4::CompiledData::DependentTypesHasher());
 
@@ -596,7 +596,7 @@ private:
     char *writeBindings(char *bindingPtr, const Object *o, BindingFilter filter) const;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT JSCodeGen : public QV4::Compiler::Codegen
+struct Q_QML_COMPILER_PRIVATE_EXPORT JSCodeGen : public QV4::Compiler::Codegen
 {
     JSCodeGen(Document *document, const QSet<QString> &globalNames,
               QV4::Compiler::CodegenWarningInterface *iface =
diff --git a/src/qml/compiler/qv4bytecodehandler_p.h b/src/qml/compiler/qv4bytecodehandler_p.h
index c1526e58a1..b9c470320d 100644
--- a/src/qml/compiler/qv4bytecodehandler_p.h
+++ b/src/qml/compiler/qv4bytecodehandler_p.h
@@ -92,7 +92,7 @@ namespace Moth {
 #define BYTECODE_HANDLER_DEFINE_VIRTUAL_BYTECODE_HANDLER(instr) \
     INSTR_##instr(BYTECODE_HANDLER_DEFINE_VIRTUAL_BYTECODE_HANDLER)
 
-class Q_QMLCOMPILER_PRIVATE_EXPORT ByteCodeHandler
+class Q_QML_COMPILER_PRIVATE_EXPORT ByteCodeHandler
 {
     Q_DISABLE_COPY_MOVE(ByteCodeHandler)
 public:
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 16b5e02969..ff9f23b1eb 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -80,7 +80,7 @@ struct ControlFlow;
 struct ControlFlowCatch;
 struct ControlFlowFinally;
 
-class Q_QMLCOMPILER_PRIVATE_EXPORT CodegenWarningInterface
+class Q_QML_COMPILER_PRIVATE_EXPORT CodegenWarningInterface
 {
 public:
     virtual void reportVarUsedBeforeDeclaration(const QString &name, const QString &fileName,
@@ -95,7 +95,7 @@ inline CodegenWarningInterface *defaultCodegenWarningInterface()
     return &iface;
 }
 
-class Q_QMLCOMPILER_PRIVATE_EXPORT Codegen: protected QQmlJS::AST::Visitor
+class Q_QML_COMPILER_PRIVATE_EXPORT Codegen: protected QQmlJS::AST::Visitor
 {
 protected:
     using BytecodeGenerator = QV4::Moth::BytecodeGenerator;
diff --git a/src/qml/compiler/qv4compiler_p.h b/src/qml/compiler/qv4compiler_p.h
index ff5cd3f18e..d690b28315 100644
--- a/src/qml/compiler/qv4compiler_p.h
+++ b/src/qml/compiler/qv4compiler_p.h
@@ -78,7 +78,7 @@ struct Module;
 struct Class;
 struct TemplateObject;
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT StringTableGenerator {
+struct Q_QML_COMPILER_PRIVATE_EXPORT StringTableGenerator {
     StringTableGenerator();
 
     int registerString(const QString &str);
@@ -105,7 +105,7 @@ private:
     bool frozen = false;
 };
 
-struct Q_QMLCOMPILER_PRIVATE_EXPORT JSUnitGenerator {
+struct Q_QML_COMPILER_PRIVATE_EXPORT JSUnitGenerator {
     static void generateUnitChecksum(CompiledData::Unit *unit);
 
     struct MemberInfo {
diff --git a/src/qml/qmldirparser/qqmldirparser_p.h b/src/qml/qmldirparser/qqmldirparser_p.h
index 1a9fa6ff2b..627b71d795 100644
--- a/src/qml/qmldirparser/qqmldirparser_p.h
+++ b/src/qml/qmldirparser/qqmldirparser_p.h
@@ -61,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 class QQmlEngine;
-class Q_QMLCOMPILER_PRIVATE_EXPORT QQmlDirParser
+class Q_QML_COMPILER_PRIVATE_EXPORT QQmlDirParser
 {
 public:
     void clear();
diff --git a/src/qml/qmldirparser/qqmlimportresolver_p.h b/src/qml/qmldirparser/qqmlimportresolver_p.h
index 743e9f5526..61ceb91524 100644
--- a/src/qml/qmldirparser/qqmlimportresolver_p.h
+++ b/src/qml/qmldirparser/qqmlimportresolver_p.h
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_QMLCOMPILER_PRIVATE_EXPORT QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths,
+Q_QML_COMPILER_PRIVATE_EXPORT QStringList qQmlResolveImportPaths(QStringView uri, const QStringList &basePaths,
                                    QTypeRevision version);
 
 QT_END_NAMESPACE
diff --git a/src/qml/qtqmlcompilerglobal.h b/src/qml/qtqmlcompilerglobal.h
index 81bd63eb95..732bc51be0 100644
--- a/src/qml/qtqmlcompilerglobal.h
+++ b/src/qml/qtqmlcompilerglobal.h
@@ -45,12 +45,12 @@
 QT_BEGIN_NAMESPACE
 
 #if defined(QT_STATIC)
-#  define Q_QMLCOMPILER_EXPORT
+#  define Q_QML_COMPILER_EXPORT
 #else
 #  if defined(QT_BUILD_QML_LIB)
-#    define Q_QMLCOMPILER_EXPORT Q_DECL_EXPORT
+#    define Q_QML_COMPILER_EXPORT Q_DECL_EXPORT
 #  else
-#    define Q_QMLCOMPILER_EXPORT Q_DECL_IMPORT
+#    define Q_QML_COMPILER_EXPORT Q_DECL_IMPORT
 #  endif
 #endif
 
diff --git a/src/qml/qtqmlcompilerglobal_p.h b/src/qml/qtqmlcompilerglobal_p.h
index 9c8bce23d3..0f35231421 100644
--- a/src/qml/qtqmlcompilerglobal_p.h
+++ b/src/qml/qtqmlcompilerglobal_p.h
@@ -54,6 +54,6 @@
 #include <QtCore/private/qglobal_p.h>
 #include <qtqmlcompilerglobal.h>
 
-#define Q_QMLCOMPILER_PRIVATE_EXPORT Q_QMLCOMPILER_EXPORT
+#define Q_QML_COMPILER_PRIVATE_EXPORT Q_QML_COMPILER_EXPORT
 
 #endif // QTQMLCOMPILERGLOBAL_P_H