Commit 3e2953e0 authored by Marc Mutz's avatar Marc Mutz
Browse files

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: default avatarAlex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: default avatarOlivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Showing with 9 additions and 0 deletions
...@@ -67,6 +67,9 @@ public: ...@@ -67,6 +67,9 @@ public:
private: private:
void doCheck(); 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) inline QDBusObjectPath::QDBusObjectPath(const char *objectPath)
: m_path(QString::fromLatin1(objectPath)) : m_path(QString::fromLatin1(objectPath))
...@@ -114,6 +117,9 @@ public: ...@@ -114,6 +117,9 @@ public:
private: private:
void doCheck(); 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) inline QDBusSignature::QDBusSignature(const char *dBusSignature)
: m_signature(QString::fromLatin1(dBusSignature)) : m_signature(QString::fromLatin1(dBusSignature))
...@@ -154,6 +160,9 @@ public: ...@@ -154,6 +160,9 @@ public:
inline QVariant variant() const inline QVariant variant() const
{ return m_variant; } { 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) inline QDBusVariant::QDBusVariant(const QVariant &dBusVariant)
: m_variant(dBusVariant) { } : m_variant(dBusVariant) { }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment