From d705d7e5d662f320d0c0515fa02a7e29e59ce762 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Wed, 23 Jun 2021 10:05:43 +0200
Subject: [PATCH] Migrate to autogenerated cpp exports

Use autogeneratedd cpp exports in the Gui module.

Task-number: QTBUG-90492
Change-Id: Ifc5d3dd138ef9f86f6003ed9adb66a9eefdd64db
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 src/gui/CMakeLists.txt       |  1 +
 src/gui/kernel/qt_gui_pch.h  |  1 +
 src/gui/kernel/qtguiglobal.h | 15 +--------------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 5fe4d59d10..d2be239d84 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -277,6 +277,7 @@ qt_internal_add_module(Gui
         "painting/qdrawhelper.cpp" # special case
     PRECOMPILED_HEADER
         "kernel/qt_gui_pch.h"
+    GENERATE_CPP_EXPORTS
 )
 
 # Resources:
diff --git a/src/gui/kernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h
index 5e07fa45e7..e7cccba027 100644
--- a/src/gui/kernel/qt_gui_pch.h
+++ b/src/gui/kernel/qt_gui_pch.h
@@ -48,6 +48,7 @@
 #include "../../corelib/global/qt_pch.h"
 
 #if defined __cplusplus
+#include <qtguiexports.h>
 #include <qtguiglobal.h>
 #include <qguiapplication.h>
 #include <qbitmap.h>
diff --git a/src/gui/kernel/qtguiglobal.h b/src/gui/kernel/qtguiglobal.h
index 8a7409e3d9..2303d75466 100644
--- a/src/gui/kernel/qtguiglobal.h
+++ b/src/gui/kernel/qtguiglobal.h
@@ -42,19 +42,6 @@
 
 #include <QtCore/qglobal.h>
 #include <QtGui/qtgui-config.h>
-
-QT_BEGIN_NAMESPACE
-
-#ifndef QT_STATIC
-#  if defined(QT_BUILD_GUI_LIB)
-#    define Q_GUI_EXPORT Q_DECL_EXPORT
-#  else
-#    define Q_GUI_EXPORT Q_DECL_IMPORT
-#  endif
-#else
-#  define Q_GUI_EXPORT
-#endif
-
-QT_END_NAMESPACE
+#include <QtGui/qtguiexports.h>
 
 #endif // QTGUIGLOBAL_H