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/testlib | |
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/testlib')
-rw-r--r-- | src/testlib/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/testlib/qttestglobal.h | 11 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt index 32e44c2d07..18fd9d2cee 100644 --- a/src/testlib/CMakeLists.txt +++ b/src/testlib/CMakeLists.txt @@ -68,6 +68,7 @@ qt_internal_add_module(Test Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate + GENERATE_CPP_EXPORTS ) #### Keys ignored in scope 1:.:.:testlib.pro:<TRUE>: diff --git a/src/testlib/qttestglobal.h b/src/testlib/qttestglobal.h index 9561e56ba3..70a14d2dd2 100644 --- a/src/testlib/qttestglobal.h +++ b/src/testlib/qttestglobal.h @@ -42,19 +42,10 @@ #include <QtCore/qglobal.h> #include <QtTest/qttestlib-config.h> +#include <QtTest/qttestexports.h> QT_BEGIN_NAMESPACE -#if defined(QT_STATIC) -# define Q_TESTLIB_EXPORT -#else -# ifdef QT_BUILD_TESTLIB_LIB -# define Q_TESTLIB_EXPORT Q_DECL_EXPORT -# else -# define Q_TESTLIB_EXPORT Q_DECL_IMPORT -# endif -#endif - #if (defined Q_CC_HPACC) && (defined __ia64) # ifdef Q_TESTLIB_EXPORT # undef Q_TESTLIB_EXPORT |