Compile with QT_STRICT_ITERATORS defined

This will be the only options for Qt 6, so make sure the code compiles now.

Change-Id: I23f791d1efcbd0bd33805bb4563d40460954db43
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>

3 files changed, 7 insertions, 5 deletions

diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 466c575c3e..3fc199c0a1 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -505,9 +505,9 @@ QTextCodec::~QTextCodec()
 
     globalData->allCodecs.removeOne(this);
 
-    auto it = globalData->codecCache.cbegin();
+    auto it = globalData->codecCache.begin();
 
-    while (it != globalData->codecCache.cend()) {
+    while (it != globalData->codecCache.end()) {
         if (it.value() == this)
             it = globalData->codecCache.erase(it);
         else
diff --git a/src/plugins/platforms/xcb/qxcbeventqueue.cpp b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
index 862f68764b..883268b083 100644
--- a/src/plugins/platforms/xcb/qxcbeventqueue.cpp
+++ b/src/plugins/platforms/xcb/qxcbeventqueue.cpp
@@ -257,7 +257,7 @@ qint32 QXcbEventQueue::generatePeekerId()
 
 bool QXcbEventQueue::removePeekerId(qint32 peekerId)
 {
-    const auto it = m_peekerToNode.find(peekerId);
+    const auto it = m_peekerToNode.constFind(peekerId);
     if (it == m_peekerToNode.constEnd()) {
         qCWarning(lcQpaXcb, "failed to remove unknown peeker id: %d", peekerId);
         return false;
@@ -276,7 +276,7 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData,
     const bool peekerIdProvided = peekerId != -1;
     auto peekerToNodeIt = m_peekerToNode.find(peekerId);
 
-    if (peekerIdProvided && peekerToNodeIt == m_peekerToNode.constEnd()) {
+    if (peekerIdProvided && peekerToNodeIt == m_peekerToNode.end()) {
         qCWarning(lcQpaXcb, "failed to find index for unknown peeker id: %d", peekerId);
         return false;
     }
@@ -336,7 +336,7 @@ bool QXcbEventQueue::peekEventQueue(PeekerCallback peeker, void *peekerData,
         // Before updating, make sure that a peeker callback did not remove
         // the peeker id.
         peekerToNodeIt = m_peekerToNode.find(peekerId);
-        if (peekerToNodeIt != m_peekerToNode.constEnd())
+        if (peekerToNodeIt != m_peekerToNode.end())
             *peekerToNodeIt = node; // id still in the cache, update node
     }
 
diff --git a/src/tools/qlalr/lalr.h b/src/tools/qlalr/lalr.h
index 6a2baaa462..8eadee400d 100644
--- a/src/tools/qlalr/lalr.h
+++ b/src/tools/qlalr/lalr.h
@@ -61,6 +61,8 @@ public:
   public:
     const_iterator () {}
 
+    const_iterator (const typename _Base::iterator &it):
+      _M_iterator (typename _Base::const_iterator(it)) {}
     const_iterator (const typename _Base::const_iterator &it):
       _M_iterator (it) {}