From a4363030bf4efd8ed4d6cd99323a14231189e0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Fri, 24 Jan 2020 12:21:46 +0100 Subject: [PATCH] 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 --- src/corelib/tools/qmap.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 QMultiMap &QMultiMap::unite(const QMultiMap &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