From 3e2953e05a672a173b65c67fdeec44fb4f30693d Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 24 Jun 2015 01:45:19 +0200 Subject: QtDBus: mark some types as movable come Qt 6 Marking them movable now would make QLists of these types BiC. Change-Id: I7ae06aec596b349ee05e48f24a077af743450669 Reviewed-by: Alex Blasche Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/dbus/qdbusextratypes.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 5032db08d0..793ef3191b 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -67,6 +67,9 @@ public: private: void doCheck(); }; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_DECLARE_TYPEINFO(QDBusObjectPath, Q_MOVABLE_TYPE); +#endif inline QDBusObjectPath::QDBusObjectPath(const char *objectPath) : m_path(QString::fromLatin1(objectPath)) @@ -114,6 +117,9 @@ public: private: void doCheck(); }; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_DECLARE_TYPEINFO(QDBusSignature, Q_MOVABLE_TYPE); +#endif inline QDBusSignature::QDBusSignature(const char *dBusSignature) : m_signature(QString::fromLatin1(dBusSignature)) @@ -154,6 +160,9 @@ public: inline QVariant variant() const { return m_variant; } }; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_DECLARE_TYPEINFO(QDBusVariant, Q_MOVABLE_TYPE); +#endif inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant) : m_variant(dBusVariant) { } -- cgit v1.2.3