summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-01-24 12:21:46 +0100
committerMårten Nordheim <marten.nordheim@qt.io>2020-01-27 08:33:47 +0100
commita4363030bf4efd8ed4d6cd99323a14231189e0f4 (patch)
tree2deba0256934134d522ef3e7f2f93d5d0c1cba91
parentea4b837fa169c21afb79488b669d30bca2fcb94f (diff)
QMultiMap: Add unite documentation
I missed copying over the documentation from QMap::unite when deprecating it. Amends 4ec6748c6a30f74e6d8fbb90fc118b306d1fa690 Change-Id: I118382c4645bdc679a378e02a462d104b9af9aad Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/corelib/tools/qmap.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index a51e59b2b8..e2b7705b55 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -1203,7 +1203,7 @@ void QMapDataBase::freeData(QMapDataBase *d)
key is common to both maps, the resulting map will contain the
key multiple times.
- \sa QMap::unite()
+ \sa QMultiMap::unite()
*/
/*! \typedef QMap::Iterator
@@ -2128,4 +2128,11 @@ void QMapDataBase::freeData(QMapDataBase *d)
once in the returned list.
*/
+/*! \fn template <class Key, class T> QMultiMap<Key, T> &QMultiMap<Key, T>::unite(const QMultiMap<Key, T> &other)
+
+ Inserts all the items in the \a other map into this map. If a
+ key is common to both maps, the resulting map will contain the
+ key multiple times.
+*/
+
QT_END_NAMESPACE