AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtDBus: mark some types as movable come Qt 6

Browse Source 
Marking them movable now would make QLists of these types BiC.

Change-Id: I7ae06aec596b349ee05e48f24a077af743450669
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2015-06-24 01:45:19 +02:00
parent db5e672acc
commit 3e2953e05a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dbus/qdbusextratypes.h
View File

@ -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) { }