From 22d0e91970b6ac53a51a715e47cae4e4209cd78b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Tue, 28 Jan 2020 12:55:15 +0100
Subject: 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>
---
 src/corelib/tools/qhash.h | 2 ++
 1 file changed, 2 insertions(+)

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)
-- 
cgit v1.2.3