From e4186b2b28ebe0fefc3f2eaecb7e8345d79ee63f Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 1 Apr 2022 09:39:11 +0200 Subject: [PATCH] =?UTF-8?q?QtDBus:=20sweep=20Q=5FDECLARE=5FMETATYPE=20?= =?UTF-8?q?=E2=86=92=20QT=5FDECL=5FMETATYPE=5FEXTERN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mårten Nordheim --- src/dbus/qdbusargument.cpp | 2 ++ src/dbus/qdbusargument.h | 2 +- src/dbus/qdbusintegrator.cpp | 2 ++ 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 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