From 7f09d0b756ff3f9bb52737d4aaf65ed84d751316 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 18 Apr 2012 14:20:54 +0200
Subject: Merge QML inspector into debugger plugin

Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
 src/plugins/debugger/qml/qmlcppengine.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')

diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 051243153a..b718afc59e 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -37,6 +37,7 @@
 #include "stackhandler.h"
 #include "qmlengine.h"
 #include "qtmessageloghandler.h"
+#include "watchdata.h"
 
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
@@ -149,6 +150,8 @@ bool QmlCppEngine::setToolTipExpression(const QPoint & mousePos,
 void QmlCppEngine::updateWatchData(const WatchData &data,
     const WatchUpdateFlags &flags)
 {
+    if (data.iname.startsWith("inspect."))
+        d->m_qmlEngine->updateWatchData(data, flags);
     d->m_activeEngine->updateWatchData(data, flags);
 }
 
-- 
cgit v1.2.1