summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qmap.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-15 14:15:56 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-15 14:15:56 (GMT)
commit925c41f2a1c38d958de3844785bcc8c83ff74004 (patch)
tree259c58feef38e07c1261d2a38ec4a3916d6f3f83 /src/corelib/tools/qmap.cpp
parent3a205ce73d4f87ad499b09cc7a7eb43c61c26cf9 (diff)
parent8197e5fae939c264220666162fe9ecb624e47bef (diff)
downloadQt-925c41f2a1c38d958de3844785bcc8c83ff74004.zip
Qt-925c41f2a1c38d958de3844785bcc8c83ff74004.tar.gz
Qt-925c41f2a1c38d958de3844785bcc8c83ff74004.tar.bz2
Merge branch 'qstatictext-4.7' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into qstatictext-4.7
Diffstat (limited to 'src/corelib/tools/qmap.cpp')
-rw-r--r--src/corelib/tools/qmap.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 82cbe78..3143ee4 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -473,6 +473,11 @@ void QMapData::dump()
\internal
*/
+/*! \fn bool QMap::isSharedWith(const QMap<Key, T> &other) const
+
+ \internal
+*/
+
/*! \fn void QMap::setInsertInOrder(bool sharable)
\internal