diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-28 12:55:15 +0100 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2020-01-30 07:11:40 +0100 |
| commit | 22d0e91970b6ac53a51a715e47cae4e4209cd78b (patch) | |
| tree | 20f22a3b5021bbed76543b665176897fdd52ecda /src/corelib/tools/qhash.h | |
| parent | 4f077b7e5ff1081afc0e362bdab6522c2b7ee43b (diff) | |
QHash: Re-remove Java-style iterator
When deprecating reverse iteratation for QHash the macro defining
QHashIterator was expanded but QT_NO_JAVA_STYLE_ITERATORS was
unfortunately forgotten. This patch brings it back.
Amends dbb54805f63f9ed68d84fe090d608872f16170d2
Change-Id: I7b1912a13f6f8d2446c1f61a1c4a19afb2f28993
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/tools/qhash.h')
| -rw-r--r-- | src/corelib/tools/qhash.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 0b8a0b283d..921b781f4a 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -1264,6 +1264,7 @@ Q_OUTOFLINE_TEMPLATE int QMultiHash<Key, T>::count(const Key &akey) const return cnt; } +#if !defined(QT_NO_JAVA_STYLE_ITERATORS) template <class Key, class T> class QHashIterator { @@ -1438,6 +1439,7 @@ public: } #endif }; +#endif // !QT_NO_JAVA_STYLE_ITERATORS template <class Key, class T> uint qHash(const QHash<Key, T> &key, uint seed = 0) |