From a5da571ed574eed70380614c0f12d075fbe784fd Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Sun, 11 Aug 2019 08:41:43 +0200
Subject: [PATCH] Port from Java-style QMapIterators

So that it compiles against qtbase/dev

Change-Id: I628ee8b935cfde11c0a67ccc09f3b64aa7a884d3
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/tools/iostool/main.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/tools/iostool/main.cpp b/src/tools/iostool/main.cpp
index 328956e971b..8eccc68d171 100644
--- a/src/tools/iostool/main.cpp
+++ b/src/tools/iostool/main.cpp
@@ -31,7 +31,6 @@
 #include <QDebug>
 #include <QXmlStreamWriter>
 #include <QFile>
-#include <QMapIterator>
 #include <QScopedArrayPointer>
 #include <QTcpServer>
 #include <QSocketNotifier>
@@ -816,9 +815,7 @@ void IosTool::deviceInfo(const QString &deviceId, const Ios::IosDeviceManager::D
         QMutexLocker l(&m_xmlMutex);
         out.writeTextElement(QLatin1String("device_id"), deviceId);
         out.writeStartElement(QLatin1String("device_info"));
-        QMapIterator<QString,QString> i(devInfo);
-        while (i.hasNext()) {
-            i.next();
+        for (auto i = devInfo.cbegin(); i != devInfo.cend(); ++i) {
             out.writeStartElement(QLatin1String("item"));
             out.writeTextElement(QLatin1String("key"), i.key());
             out.writeTextElement(QLatin1String("value"), i.value());