diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index fb1e9f9cae3..cefd12b986d 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -46,6 +46,7 @@ qt_internal_add_module(DBus DBUS_API_SUBJECT_TO_CHANGE QT_NO_CONTEXTLESS_CONNECT QT_NO_FOREACH + QT_NO_QPAIR LIBRARIES Qt::CorePrivate PUBLIC_LIBRARIES diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 1774b6e40c0..70f6703d2f2 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -304,7 +304,7 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map) } template -inline QDBusArgument &operator<<(QDBusArgument &arg, const QPair &pair) +inline QDBusArgument &operator<<(QDBusArgument &arg, const std::pair &pair) { arg.beginStructure(); arg << pair.first << pair.second; @@ -313,7 +313,7 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QPair &pair) } template -inline const QDBusArgument &operator>>(const QDBusArgument &arg, QPair &pair) +inline const QDBusArgument &operator>>(const QDBusArgument &arg, std::pair &pair) { arg.beginStructure(); arg >> pair.first >> pair.second;