diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-28 16:33:43 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-09-27 13:39:00 +0200 |
| commit | 09d456e169204e21ee73fec830e6ce49c1a4d2c1 (patch) | |
| tree | 7ca19ca373e7ebf79d4c94f943251f7c06fd5dee | |
| parent | 84f20ed8aa5810750b6fbedb61110e1eff7dfdc0 (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: Idc2d2d9f7ba2abbff462a27599b9a7b1aa704a4f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/websockets/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/websockets/qwebsockets_global.h | 14 |
2 files changed, 2 insertions, 13 deletions
diff --git a/src/websockets/CMakeLists.txt b/src/websockets/CMakeLists.txt index 6a65c8e..066d3f0 100644 --- a/src/websockets/CMakeLists.txt +++ b/src/websockets/CMakeLists.txt @@ -24,6 +24,7 @@ qt_internal_add_module(WebSockets Qt::Network PRIVATE_MODULE_INTERFACE Qt::CorePrivate + GENERATE_CPP_EXPORTS ) #### Keys ignored in scope 1:.:.:websockets.pro:<TRUE>: diff --git a/src/websockets/qwebsockets_global.h b/src/websockets/qwebsockets_global.h index d4b7aca..5ac217a 100644 --- a/src/websockets/qwebsockets_global.h +++ b/src/websockets/qwebsockets_global.h @@ -41,18 +41,6 @@ #define QWEBSOCKETSGLOBAL_H #include <QtCore/qglobal.h> +#include <QtWebSockets/qtwebsocketsexports.h> -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_WEBSOCKETS_LIB) -# define Q_WEBSOCKETS_EXPORT Q_DECL_EXPORT -# else -# define Q_WEBSOCKETS_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_WEBSOCKETS_EXPORT -#endif - -QT_END_NAMESPACE #endif // QWEBSOCKETSGLOBAL_H |