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/dbus | |
| 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/dbus')
| -rw-r--r-- | src/dbus/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/dbus/qtdbusglobal.h | 16 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index d7a82f9fe3..5e4ee48ee7 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -48,6 +48,7 @@ qt_internal_add_module(DBus Qt::Core PRIVATE_MODULE_INTERFACE Qt::CorePrivate + GENERATE_CPP_EXPORTS ) set_source_files_properties(qdbusmarshaller.cpp diff --git a/src/dbus/qtdbusglobal.h b/src/dbus/qtdbusglobal.h index 177b9cda6b..69c1afb085 100644 --- a/src/dbus/qtdbusglobal.h +++ b/src/dbus/qtdbusglobal.h @@ -53,22 +53,8 @@ #include <QtCore/qset.h> #endif -QT_BEGIN_NAMESPACE - #ifndef QT_NO_DBUS - -#ifndef QT_STATIC -# if defined(QT_BUILD_DBUS_LIB) -# define Q_DBUS_EXPORT Q_DECL_EXPORT -# else -# define Q_DBUS_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_DBUS_EXPORT -#endif - +#include <QtDBus/qtdbusexports.h> #endif // QT_NO_DBUS -QT_END_NAMESPACE - #endif |