debugger: remove special mechanism to update watcher and return window

1 files changed, 5 insertions, 4 deletions

diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp
index 63a5a578353..2118ddd9ea4 100644
--- a/src/plugins/debugger/watchhandler.cpp
+++ b/src/plugins/debugger/watchhandler.cpp
@@ -1226,6 +1226,7 @@ void WatchHandler::watchExpression(const QString &exp)
     m_engine->updateWatchData(data);
     updateWatchersWindow();
     saveWatchers();
+    emitAllChanged();
 }
 
 static void swapEndian(char *d, int nchar)
@@ -1340,13 +1341,14 @@ void WatchHandler::removeWatchExpression(const QString &exp0)
             break;
         }
     }
+    updateWatchersWindow();
+    emitAllChanged();
 }
 
 void WatchHandler::updateWatchersWindow()
 {
-    const bool showWatchers = m_watchers->rowCount(QModelIndex()) > 0;
-    const bool showReturn = m_return->rowCount(QModelIndex()) > 0;
-    plugin()->updateWatchersWindow(showWatchers, showReturn);
+    // Force show/hide of watchers and return view.
+    plugin()->updateState(m_engine);
 }
 
 void WatchHandler::updateWatchers()
@@ -1370,7 +1372,6 @@ void WatchHandler::loadWatchers()
         m_watcherNames[exp.toLatin1()] = watcherCounter++;
 
     //qDebug() << "LOAD WATCHERS: " << m_watchers;
-    //reinitializeWatchersHelper();
 }
 
 QStringList WatchHandler::watchedExpressions() const