From c45b1c4f73ec70ce990574b66eff47cb94a80ea6 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 28 Jun 2021 16:36:08 +0200 Subject: 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 --- src/webchannel/CMakeLists.txt | 1 + src/webchannel/qwebchannelglobal.h | 15 +-------------- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'src/webchannel') 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 - -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 #endif // QTWEBCHANNEL_H -- cgit v1.2.3