From b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354 Mon Sep 17 00:00:00 2001 From: Alexey Edelev 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 --- src/concurrent/CMakeLists.txt | 1 + src/concurrent/qtconcurrent_global.h | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'src/concurrent') diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt index 876ddaf1ba..bc353f4e89 100644 --- a/src/concurrent/CMakeLists.txt +++ b/src/concurrent/CMakeLists.txt @@ -34,6 +34,7 @@ qt_internal_add_module(Concurrent Qt::CorePrivate PRECOMPILED_HEADER "../corelib/global/qt_pch.h" + GENERATE_CPP_EXPORTS ) ## Scopes: diff --git a/src/concurrent/qtconcurrent_global.h b/src/concurrent/qtconcurrent_global.h index 83c6028e20..8be7d5a12a 100644 --- a/src/concurrent/qtconcurrent_global.h +++ b/src/concurrent/qtconcurrent_global.h @@ -41,19 +41,6 @@ #define QTCONCURRENT_GLOBAL_H #include - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_CONCURRENT_LIB) -# define Q_CONCURRENT_EXPORT Q_DECL_EXPORT -# else -# define Q_CONCURRENT_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_CONCURRENT_EXPORT -#endif - -QT_END_NAMESPACE +#include #endif // include guard -- cgit v1.2.3