From 85291b9824d5862de46a494132ebe5d199a1050a Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Mon, 28 Jun 2021 16:24:42 +0200
Subject: Migrate to autogenerated cpp exports

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

Task-number: QTBUG-90492
Change-Id: I32a7f4aacbba1de145ba295df14d38fa39514eab
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/sensors/CMakeLists.txt               |  1 +
 src/sensors/qsensorsglobal.h             | 15 +--------------
 src/sensorsquick/CMakeLists.txt          |  2 ++
 src/sensorsquick/qsensorsquickglobal_p.h | 17 +----------------
 4 files changed, 5 insertions(+), 30 deletions(-)

(limited to 'src')

diff --git a/src/sensors/CMakeLists.txt b/src/sensors/CMakeLists.txt
index 1d1755cb..9b0ed256 100644
--- a/src/sensors/CMakeLists.txt
+++ b/src/sensors/CMakeLists.txt
@@ -74,6 +74,7 @@ qt_internal_add_module(Sensors
         Qt::Core
     PRIVATE_MODULE_INTERFACE
         Qt::CorePrivate
+    GENERATE_CPP_EXPORTS
 )
 
 if(ANDROID)
diff --git a/src/sensors/qsensorsglobal.h b/src/sensors/qsensorsglobal.h
index 70985c27..3dd4eeb8 100644
--- a/src/sensors/qsensorsglobal.h
+++ b/src/sensors/qsensorsglobal.h
@@ -41,20 +41,7 @@
 #define QSENSORSGLOBAL_H
 
 #include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_STATIC
-#    if defined(QT_BUILD_SENSORS_LIB)
-#      define Q_SENSORS_EXPORT Q_DECL_EXPORT
-#    else
-#      define Q_SENSORS_EXPORT Q_DECL_IMPORT
-#    endif
-#else
-#    define Q_SENSORS_EXPORT
-#endif
-
-QT_END_NAMESPACE
+#include <QtSensors/qtsensorsexports.h>
 
 #endif // QSENSORSGLOBAL_H
 
diff --git a/src/sensorsquick/CMakeLists.txt b/src/sensorsquick/CMakeLists.txt
index 304504a2..00aa7b46 100644
--- a/src/sensorsquick/CMakeLists.txt
+++ b/src/sensorsquick/CMakeLists.txt
@@ -33,4 +33,6 @@ qt_internal_add_qml_module(SensorsQuick
         Qt::Sensors
     LIBRARIES
         Qt::CorePrivate
+    GENERATE_CPP_EXPORTS
+    GENERATE_PRIVATE_CPP_EXPORTS
 )
diff --git a/src/sensorsquick/qsensorsquickglobal_p.h b/src/sensorsquick/qsensorsquickglobal_p.h
index 4f6034f6..9afe14d9 100644
--- a/src/sensorsquick/qsensorsquickglobal_p.h
+++ b/src/sensorsquick/qsensorsquickglobal_p.h
@@ -52,22 +52,7 @@
 //
 
 #include <QtCore/qglobal.h>
-
-QT_BEGIN_NAMESPACE
-
-#if !defined(QT_STATIC)
-#  if defined(QT_BUILD_SENSORSQUICK_LIB)
-#    define Q_SENSORSQUICK_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_SENSORSQUICK_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_SENSORSQUICK_EXPORT
-#endif
-
-#define Q_SENSORSQUICK_PRIVATE_EXPORT Q_SENSORSQUICK_EXPORT
-
-QT_END_NAMESPACE
+#include <QtSensorsQuick/private/qtsensorsquickexports_p.h>
 
 void Q_SENSORSQUICK_PRIVATE_EXPORT qml_register_types_QtSensors();
 
-- 
cgit v1.2.3