diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-28 16:26:15 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-09-27 13:39:09 +0200 |
| commit | f38e35e5267ba1441915b0a31b988f80c7874f74 (patch) | |
| tree | fe96eabc4c100f3ac1a7c3179074f52b3e61ed5d /src | |
| parent | 11be62a81b6ab29915476aae746417492be9bac8 (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: Ia457fc7f39b4c4b3e4db26e72b9dc04873a61720
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/serialport/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/serialport/qserialportglobal.h | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/serialport/CMakeLists.txt b/src/serialport/CMakeLists.txt index 35810e0b..25558ead 100644 --- a/src/serialport/CMakeLists.txt +++ b/src/serialport/CMakeLists.txt @@ -16,6 +16,7 @@ qt_internal_add_module(SerialPort Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate + GENERATE_CPP_EXPORTS ) ## Scopes: diff --git a/src/serialport/qserialportglobal.h b/src/serialport/qserialportglobal.h index f6c58038..77a82d3d 100644 --- a/src/serialport/qserialportglobal.h +++ b/src/serialport/qserialportglobal.h @@ -43,19 +43,6 @@ #include <QtCore/qstring.h> #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_SERIALPORT_LIB) -# define Q_SERIALPORT_EXPORT Q_DECL_EXPORT -# else -# define Q_SERIALPORT_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_SERIALPORT_EXPORT -#endif - -QT_END_NAMESPACE +#include <QtSerialPort/qtserialportexports.h> #endif // QSERIALPORTGLOBAL_H |