From b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Fri, 25 Jun 2021 11:28:27 +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: Idc160b594987b2c765e75bd669aae851b4366282
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/printsupport/CMakeLists.txt                |  1 +
 src/printsupport/kernel/qtprintsupportglobal.h | 15 +--------------
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'src/printsupport')

diff --git a/src/printsupport/CMakeLists.txt b/src/printsupport/CMakeLists.txt
index 02f9ed52e0..43dd89ed85 100644
--- a/src/printsupport/CMakeLists.txt
+++ b/src/printsupport/CMakeLists.txt
@@ -36,6 +36,7 @@ qt_internal_add_module(PrintSupport
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::WidgetsPrivate
+    GENERATE_CPP_EXPORTS
 )
 
 #### Keys ignored in scope 1:.:.:printsupport.pro:<TRUE>:
diff --git a/src/printsupport/kernel/qtprintsupportglobal.h b/src/printsupport/kernel/qtprintsupportglobal.h
index 67779af5a2..5d958432ea 100644
--- a/src/printsupport/kernel/qtprintsupportglobal.h
+++ b/src/printsupport/kernel/qtprintsupportglobal.h
@@ -42,19 +42,6 @@
 
 #include <QtWidgets/qtwidgetsglobal.h>
 #include <QtPrintSupport/qtprintsupport-config.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_STATIC
-#  if defined(QT_BUILD_PRINTSUPPORT_LIB)
-#    define Q_PRINTSUPPORT_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_PRINTSUPPORT_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_PRINTSUPPORT_EXPORT
-#endif
-
-QT_END_NAMESPACE
+#include <QtPrintSupport/qtprintsupportexports.h>
 
 #endif // QTPRINTSUPPORTGLOBAL_H
-- 
cgit v1.2.3