diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-04-01 09:39:11 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-04-03 16:18:43 +0200 |
| commit | e4186b2b28ebe0fefc3f2eaecb7e8345d79ee63f (patch) | |
| tree | 5315a9183220ce89ceaf3d5fad96c8dc2e609729 | |
| parent | e191edfad0100af9b514e532fa80f1035280aecb (diff) | |
QtDBus: sweep Q_DECLARE_METATYPE → QT_DECL_METATYPE_EXTERN
It's one of our best tools to improve compile times.
Can't backport to Qt 6.3 or 6.2 because this change introduces new
exported symbols.
Task-number: QTBUG-102206
Change-Id: Iae9d4017a984c845a76d0b9b088ad3e467fe1d54
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| -rw-r--r-- | src/dbus/qdbusargument.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusargument.h | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 2 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator_p.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/dbus/qdbusargument.cpp b/src/dbus/qdbusargument.cpp index 7023958f56..18d849ba4b 100644 --- a/src/dbus/qdbusargument.cpp +++ b/src/dbus/qdbusargument.cpp @@ -58,6 +58,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN(QDBusArgument) + QDBusArgumentPrivate::~QDBusArgumentPrivate() { if (message) diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index bf4a6e40e6..9df2e2eddb 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -157,7 +157,7 @@ protected: Q_DECLARE_SHARED(QDBusArgument) QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDBusArgument) +QT_DECL_METATYPE_EXTERN(QDBusArgument, Q_DBUS_EXPORT) QT_BEGIN_NAMESPACE template<typename T> inline T qdbus_cast(const QDBusArgument &arg) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 9ddaf8d4c1..5c30bc04c0 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -79,6 +79,8 @@ QT_BEGIN_NAMESPACE +QT_IMPL_METATYPE_EXTERN(QDBusSlotCache) + // used with dbus_server_allocate_data_slot static dbus_int32_t server_slot = -1; diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 3a459251f7..b850c1cad4 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -169,7 +169,7 @@ public: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QDBusSlotCache) +QT_DECL_METATYPE_EXTERN(QDBusSlotCache, Q_DBUS_EXPORT) #endif // QT_NO_DBUS #endif |