diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-25 11:28:27 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-25 19:33:12 +0200 |
| commit | b10e4e846e7b1a7b4c9c7cb7b4ef1081e22f2354 (patch) | |
| tree | 9f54caca16ad66a0d980334ea45f1ea8d5008993 /src/concurrent | |
| parent | 7968281444c967628566337ce3493058825cb946 (diff) | |
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>
Diffstat (limited to 'src/concurrent')
| -rw-r--r-- | src/concurrent/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/concurrent/qtconcurrent_global.h | 15 |
2 files changed, 2 insertions, 14 deletions
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 <QtCore/qglobal.h> - -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 <QtConcurrent/qtconcurrentexports.h> #endif // include guard |