2 files changed, 11 insertions, 12 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp
index a95a48cc8f..e07b02f7c2 100644
--- a/src/corelib/io/qfilesystemwatcher_polling.cpp
+++ b/src/corelib/io/qfilesystemwatcher_polling.cpp
@@ -110,33 +110,32 @@ QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &path
 
 void QPollingFileSystemWatcherEngine::timeout()
 {
-    QMutableHashIterator<QString, FileInfo> fit(files);
-    while (fit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = fit.next();
+    for (auto it = files.begin(), end = files.end(); it != end; /*erasing*/) {
+        auto x = it++;
         QString path = x.key();
         QFileInfo fi(path);
         if (!fi.exists()) {
-            fit.remove();
+            files.erase(x);
             emit fileChanged(path, true);
         } else if (x.value() != fi) {
             x.value() = fi;
             emit fileChanged(path, false);
         }
     }
-    QMutableHashIterator<QString, FileInfo> dit(directories);
-    while (dit.hasNext()) {
-        QHash<QString, FileInfo>::iterator x = dit.next();
+
+    for (auto it = directories.begin(), end = directories.end(); it != end; /*erasing*/) {
+        auto x = it++;
         QString path = x.key();
         QFileInfo fi(path);
         if (!path.endsWith(QLatin1Char('/')))
             fi = QFileInfo(path + QLatin1Char('/'));
         if (!fi.exists()) {
-            dit.remove();
+            directories.erase(x);
             emit directoryChanged(path, true);
         } else if (x.value() != fi) {
             fi.refresh();
             if (!fi.exists()) {
-                dit.remove();
+                directories.erase(x);
                 emit directoryChanged(path, true);
             } else {
                 x.value() = fi;
diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp
index 81ed694d95..c22a003931 100644
--- a/src/corelib/io/qfilesystemwatcher_win.cpp
+++ b/src/corelib/io/qfilesystemwatcher_win.cpp
@@ -695,9 +695,8 @@ void QWindowsFileSystemWatcherEngineThread::run()
 
                         qErrnoWarning(error, "%ls", qUtf16Printable(msgFindNextFailed(h)));
                     }
-                    QMutableHashIterator<QFileSystemWatcherPathKey, QWindowsFileSystemWatcherEngine::PathInfo> it(h);
-                    while (it.hasNext()) {
-                        QWindowsFileSystemWatcherEngineThread::PathInfoHash::iterator x = it.next();
+                    for (auto it = h.begin(), end = h.end(); it != end; /*erasing*/ ) {
+                        auto x = it++;
                         QString absolutePath = x.value().absolutePath;
                         QFileInfo fileInfo(x.value().path);
                         DEBUG() << "checking" << x.key();
@@ -723,6 +722,7 @@ void QWindowsFileSystemWatcherEngineThread::run()
 
                                 handleForDir.remove(QFileSystemWatcherPathKey(absolutePath));
                                 // h is now invalid
+                                break;
                             }
                         } else if (x.value().isDir) {
                             DEBUG() << x.key() << "directory changed!";