Revert "Enabled the use of Debugger-specific watch/locals models."

This reverts commit abf5e3ddc39b8f4971f61fb9f8dccdb1d4635bf5.

1 files changed, 10 insertions, 13 deletions

diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 7eccb04cd9e..83486e899e9 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -554,22 +554,19 @@ QList<WatchData> QtDumperResult::toWatchData(int source) const
             }
             wchild.setType(dchild.type.isEmpty() ? childType : dchild.type);
             wchild.setAddress(dchild.address);
-            // Child overrides. Note that WatchData::setType sets
-            // childcount = 0 for some known types.
-            if (wchild.isHasChildrenNeeded()) {
-                const int effectiveChildChildCount = dchild.childCount == -1 ?  childChildCount : dchild.childCount;
-                switch (effectiveChildChildCount) {
+            // Child overrides.
+            const int effectiveChildChildCount = dchild.childCount == -1 ?  childChildCount : dchild.childCount;
+            switch (effectiveChildChildCount) {
                 case -1:
-                    wchild.setChildrenNeeded();
-                    wchild.setHasChildrenNeeded();
-                    break;
+                wchild.setChildrenNeeded();
+                wchild.setHasChildrenNeeded();
+                break;
                 case 0:
-                    wchild.setHasChildren(false);
-                    break;
+                wchild.setHasChildren(false);
+                break;
                 default:
-                    wchild.setHasChildren(true);
-                    break;
-                }
+                wchild.setHasChildren(true);
+                break;
             }
         }
     }