diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 19:55:41 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-08-17 19:55:41 +0200 |
| commit | 5a039bf53e88a727cc52bfedb21796ebfade01a1 (patch) | |
| tree | abce106bf1cb1042dcacd249152a11343caa0313 /src/corelib/tools/qmap.cpp | |
| parent | dbcf5730ac2d4f61f872e50126d3ce73e3f6031e (diff) | |
| parent | 89302b8b88b2bfa9581bb15c1caa052cb6d76988 (diff) | |
Merge dev into 5.6
Change-Id: I061f2513ef58f696e75b11928d89aaaf059659a3
Diffstat (limited to 'src/corelib/tools/qmap.cpp')
| -rw-r--r-- | src/corelib/tools/qmap.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index f7aa7332ddd..e49a1a098d6 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -1719,7 +1719,7 @@ void QMapDataBase::freeData(QMapDataBase *d) Returns a pointer to the current item's key. */ -/*! \fn bool QMap::key_iterator::operator==(key_iterator other) +/*! \fn bool QMap::key_iterator::operator==(key_iterator other) const Returns \c true if \a other points to the same item as this iterator; otherwise returns \c false. @@ -1727,7 +1727,7 @@ void QMapDataBase::freeData(QMapDataBase *d) \sa operator!=() */ -/*! \fn bool QMap::key_iterator::operator!=(key_iterator other) +/*! \fn bool QMap::key_iterator::operator!=(key_iterator other) const Returns \c true if \a other points to a different item than this iterator; otherwise returns \c false. |