diff --git a/src/plugins/debugger/debuggeractions.cpp b/src/plugins/debugger/debuggeractions.cpp
index 0dec35b3fd4..d33d667f651 100644
--- a/src/plugins/debugger/debuggeractions.cpp
+++ b/src/plugins/debugger/debuggeractions.cpp
@@ -567,7 +567,6 @@ DebuggerSettings::DebuggerSettings()
     page2.registerAspect(&loadGdbInit);
     page2.registerAspect(&loadGdbDumpers);
     page2.registerAspect(&intelFlavor);
-    page2.registerAspect(&skipKnownFrames);
     page2.registerAspect(&usePseudoTracepoints);
     page2.registerAspect(&useIndexCache);
     page2.registerAspect(&gdbStartupCommands);
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index dd408318e36..3f90b003b33 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -42,8 +42,28 @@ QString removeObviousSideEffects(const QString &expIn)
 
 bool isSkippableFunction(const QString &funcName, const QString &fileName)
 {
+    if (fileName.endsWith("/atomic_base.h"))
+        return true;
+    if (fileName.endsWith("/atomic"))
+        return true;
+    if (fileName.endsWith("/qatomic_cxx11.h"))
+        return true;
+    if (fileName.endsWith("/qbasicatomic.h"))
+        return true;
+    if (fileName.endsWith("/qobjectdefs.h"))
+        return true;
+    if (fileName.endsWith("/qobjectdefs_impl.h"))
+        return true;
     if (fileName.endsWith("/qobject.cpp"))
         return true;
+    if (fileName.endsWith("/qobject_p.h"))
+        return true;
+    if (fileName.endsWith("/qobject_p_p.h"))
+        return true;
+    if (fileName.endsWith("/qscopedpointer.h"))
+        return true;
+    if (fileName.endsWith("/qthread.h"))
+        return true;
     if (fileName.endsWith("/moc_qobject.cpp"))
         return true;
     if (fileName.endsWith("/qmetaobject.cpp"))