Migrate to autogenerated cpp exports

Replace the hardcoded cpp exports with a generated one where it's
applicable.

Task-number: QTBUG-90492
Change-Id: I5960079ecefe9021c7e32e7bfcbf81a7098d97e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

9 files changed, 19 insertions, 54 deletions

diff --git a/src/scxml/CMakeLists.txt b/src/scxml/CMakeLists.txt
index 1ec6e3b..4d75b56 100644
--- a/src/scxml/CMakeLists.txt
+++ b/src/scxml/CMakeLists.txt
@@ -31,6 +31,8 @@ qt_internal_add_module(Scxml
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
+    GENERATE_CPP_EXPORTS
+    GENERATE_PRIVATE_CPP_EXPORTS
 )
 
 # Install the public qscxlmc.prf file that is used by the qmake
diff --git a/src/scxml/qscxmlglobals.h b/src/scxml/qscxmlglobals.h
index da45a2b..00377a9 100644
--- a/src/scxml/qscxmlglobals.h
+++ b/src/scxml/qscxmlglobals.h
@@ -42,19 +42,11 @@
 #include <QtCore/qglobal.h>
 #include <QtScxml/qtscxml-config.h>
 
-QT_BEGIN_NAMESPACE
-
-#if defined(QT_STATIC) || defined(BUILD_QSCXMLC)
+#if defined(BUILD_QSCXMLC)
 #  define Q_SCXML_EXPORT
 #else
-#  ifdef QT_BUILD_SCXML_LIB
-#    define Q_SCXML_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_SCXML_EXPORT Q_DECL_IMPORT
-#  endif
+#  include <QtScxml/qtscxmlexports.h>
 #endif
 
-QT_END_NAMESPACE
-
 #endif // QSCXMLGLOBALS_H
 
diff --git a/src/scxml/qscxmlglobals_p.h b/src/scxml/qscxmlglobals_p.h
index a01b57d..44064e6 100644
--- a/src/scxml/qscxmlglobals_p.h
+++ b/src/scxml/qscxmlglobals_p.h
@@ -53,12 +53,16 @@
 
 #include "qscxmlglobals.h"
 
+#if defined(BUILD_QSCXMLC)
+#  define Q_SCXML_PRIVATE_EXPORT
+#else
+#  include <QtScxml/private/qtscxmlexports_p.h>
+#endif
+
 #include <QtCore/qloggingcategory.h>
 
 QT_BEGIN_NAMESPACE
 
-#define Q_SCXML_PRIVATE_EXPORT Q_SCXML_EXPORT
-
 Q_DECLARE_LOGGING_CATEGORY(qscxmlLog)
 Q_DECLARE_LOGGING_CATEGORY(scxmlLog)
 
diff --git a/src/scxmlqml/CMakeLists.txt b/src/scxmlqml/CMakeLists.txt
index c0222c1..dce130e 100644
--- a/src/scxmlqml/CMakeLists.txt
+++ b/src/scxmlqml/CMakeLists.txt
@@ -21,4 +21,6 @@ qt_internal_add_qml_module(ScxmlQml
         Qt::Scxml
     LIBRARIES
         Qt::CorePrivate
+    GENERATE_CPP_EXPORTS
+    GENERATE_PRIVATE_CPP_EXPORTS
 )
diff --git a/src/scxmlqml/qscxmlqmlglobals_p.h b/src/scxmlqml/qscxmlqmlglobals_p.h
index b59a03a..a1dfbb2 100644
--- a/src/scxmlqml/qscxmlqmlglobals_p.h
+++ b/src/scxmlqml/qscxmlqmlglobals_p.h
@@ -52,22 +52,7 @@
 //
 
 #include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#if !defined(QT_STATIC)
-#  if defined(QT_BUILD_SCXMLQML_LIB)
-#    define Q_SCXMLQML_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_SCXMLQML_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_SCXMLQML_EXPORT
-#endif
-
-#define Q_SCXMLQML_PRIVATE_EXPORT Q_SCXMLQML_EXPORT
-
-QT_END_NAMESPACE
+#include <QtScxmlQml/private/qtscxmlqmlexports_p.h>
 
 void Q_SCXMLQML_PRIVATE_EXPORT qml_register_types_QtScxml();
 
diff --git a/src/statemachine/CMakeLists.txt b/src/statemachine/CMakeLists.txt
index a21578a..6823a27 100644
--- a/src/statemachine/CMakeLists.txt
+++ b/src/statemachine/CMakeLists.txt
@@ -25,6 +25,7 @@ qt_internal_add_module(StateMachine
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
+    GENERATE_CPP_EXPORTS
 )
 
 ## Scopes:
diff --git a/src/statemachine/qstatemachineglobal.h b/src/statemachine/qstatemachineglobal.h
index 46ea21e..005bfb9 100644
--- a/src/statemachine/qstatemachineglobal.h
+++ b/src/statemachine/qstatemachineglobal.h
@@ -43,18 +43,10 @@
 #include <QtCore/qglobal.h>
 #include <QtStateMachine/qtstatemachine-config.h>
 
-QT_BEGIN_NAMESPACE
-
-#if defined(QT_STATIC) || defined(BUILD_QSTATEMACHINE)
+#if defined(BUILD_QSTATEMACHINE)
 #  define Q_STATEMACHINE_EXPORT
 #else
-#  ifdef QT_BUILD_STATEMACHINE_LIB
-#    define Q_STATEMACHINE_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_STATEMACHINE_EXPORT Q_DECL_IMPORT
-#  endif
+#  include <QtStateMachine/qtstatemachineexports.h>
 #endif
 
-QT_END_NAMESPACE
-
 #endif // QSTATEMACHINEGLOBAL_H
diff --git a/src/statemachineqml/CMakeLists.txt b/src/statemachineqml/CMakeLists.txt
index 8323210..e4e6ff5 100644
--- a/src/statemachineqml/CMakeLists.txt
+++ b/src/statemachineqml/CMakeLists.txt
@@ -24,4 +24,6 @@ qt_internal_add_qml_module(StateMachineQml
         Qt::StateMachine
     LIBRARIES
         Qt::QmlPrivate
+    GENERATE_CPP_EXPORTS
+    GENERATE_PRIVATE_CPP_EXPORTS
 )
diff --git a/src/statemachineqml/qstatemachineqmlglobals_p.h b/src/statemachineqml/qstatemachineqmlglobals_p.h
index ec51c34..d85eccd 100644
--- a/src/statemachineqml/qstatemachineqmlglobals_p.h
+++ b/src/statemachineqml/qstatemachineqmlglobals_p.h
@@ -52,22 +52,7 @@
 //
 
 #include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#if !defined(QT_STATIC)
-#  if defined(QT_BUILD_STATEMACHINEQML_LIB)
-#    define Q_STATEMACHINEQML_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_STATEMACHINEQML_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_STATEMACHINEQML_EXPORT
-#endif
-
-#define Q_STATEMACHINEQML_PRIVATE_EXPORT Q_STATEMACHINEQML_EXPORT
-
-QT_END_NAMESPACE
+#include <QtStateMachineQml/private/qtstatemachineqmlexports_p.h>
 
 void Q_STATEMACHINEQML_PRIVATE_EXPORT qml_register_types_QtQml_StateMachine();