diff --git a/src/plugins/debugger/dap/dapengine.cpp b/src/plugins/debugger/dap/dapengine.cpp
index 923d76bfc1d..1e3cf993409 100644
--- a/src/plugins/debugger/dap/dapengine.cpp
+++ b/src/plugins/debugger/dap/dapengine.cpp
@@ -562,9 +562,9 @@ void DapEngine::updateItem(const QString &iname)
 void DapEngine::reexpandItems(const QSet<QString> &inames)
 {
     QSet<QString> expandedInames = inames;
-    const QList<QString> &watcherNames = watchHandler()->watcherNames().keys();
-    for (const QString &inames : watcherNames)
-        expandedInames.insert(watchHandler()->watcherName(inames));
+    const auto &watcherNames = watchHandler()->watcherNames();
+    for (auto it = watcherNames.begin(); it != watcherNames.end(); ++it)
+        expandedInames.insert(watchHandler()->watcherName(it.key()));
 
     QList<QString> inamesVector = expandedInames.values();
     inamesVector.sort();