diff options
Diffstat (limited to 'src/plugins/bearer')
-rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux_p.h | 5 | ||||
-rw-r--r-- | src/plugins/bearer/linux_common/qofonoservice_linux_p.h | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h index 9a2bf4eb34..e773db9b20 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h +++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h @@ -82,8 +82,9 @@ struct ConnmanMap { QDBusObjectPath objectPath; QVariantMap propertyMap; }; - -typedef QList< ConnmanMap > ConnmanMapList; +Q_DECLARE_TYPEINFO(ConnmanMap, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, but cannot be + // marked as such until Qt 6 +typedef QVector<ConnmanMap> ConnmanMapList; QT_END_NAMESPACE diff --git a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h index 43b9570c99..35614a20f2 100644 --- a/src/plugins/bearer/linux_common/qofonoservice_linux_p.h +++ b/src/plugins/bearer/linux_common/qofonoservice_linux_p.h @@ -83,7 +83,12 @@ struct ObjectPathProperties QDBusObjectPath path; QVariantMap properties; }; -typedef QList<ObjectPathProperties> PathPropertiesList; +QT_BEGIN_NAMESPACE +Q_DECLARE_TYPEINFO(ObjectPathProperties, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, but cannot be + // marked as such until Qt 6 +QT_END_NAMESPACE + +typedef QVector<ObjectPathProperties> PathPropertiesList; Q_DECLARE_METATYPE(ObjectPathProperties) Q_DECLARE_METATYPE (PathPropertiesList) |