diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-06-28 16:36:08 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-09-27 13:39:05 +0200 |
| commit | c45b1c4f73ec70ce990574b66eff47cb94a80ea6 (patch) | |
| tree | 66d1d04b2c8732ed49f72c3690a20c2538bdde54 /src/webchannel | |
| parent | 1ad32d4ab381e2dc59be51d3953422ec14b89beb (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: I2017cb07a3f4689aa0120da7b32241352a47ae27
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/webchannel')
| -rw-r--r-- | src/webchannel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/webchannel/qwebchannelglobal.h | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/src/webchannel/CMakeLists.txt b/src/webchannel/CMakeLists.txt index acd33fe..9e4b721 100644 --- a/src/webchannel/CMakeLists.txt +++ b/src/webchannel/CMakeLists.txt @@ -17,6 +17,7 @@ qt_internal_add_module(WebChannel Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate + GENERATE_CPP_EXPORTS ) # Resources: diff --git a/src/webchannel/qwebchannelglobal.h b/src/webchannel/qwebchannelglobal.h index 59fb099..6f50bcb 100644 --- a/src/webchannel/qwebchannelglobal.h +++ b/src/webchannel/qwebchannelglobal.h @@ -41,19 +41,6 @@ #define QTWEBCHANNEL_H #include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_WEBCHANNEL_LIB) -# define Q_WEBCHANNEL_EXPORT Q_DECL_EXPORT -# else -# define Q_WEBCHANNEL_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_WEBCHANNEL_EXPORT -#endif - -QT_END_NAMESPACE +#include <QtWebChannel/qtwebchannelexports.h> #endif // QTWEBCHANNEL_H |