diff options
| author | David Faure <david.faure@kdab.com> | 2021-08-24 14:20:41 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2022-05-17 01:27:33 +0200 |
| commit | 546e11f1dc5ba6959cf103088dff8042869ac3de (patch) | |
| tree | bacde1be56d9c6e29d7efc298bc1bc25b1bf0c63 /src/dbus | |
| parent | 42cf2a2617ffd0d563fcd46c5aa5409007e211de (diff) | |
QDBusArgument: ensure std::vector isn't seen as an associative container
This broke compilation of qDBusRegisterMetaType<std::vector<MyStruct>>
because std::vector<T> is in fact std::vector<T, std::allocator<T>>.
Pick-to: 6.2
Change-Id: I6a13f5f0476a3faa3a43da54d90d652b4bdd8186
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/qdbusargument.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index f218ec88eb..475c47f442 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -264,7 +264,7 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const Container<Key, T> &ma } template <template <typename, typename> class Container, typename Key, typename T, - typename = typename Container<Key, T>::iterator> + QtPrivate::IfAssociativeIteratorHasKeyAndValue<typename Container<Key, T>::iterator> = true> inline const QDBusArgument &operator>>(const QDBusArgument &arg, Container<Key, T> &map) { arg.beginMap(); |