feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge QML inspector into debugger plugin

Browse Source 
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>
This commit is contained in:
Kai Koehne
2012-04-18 14:20:54 +02:00
parent d201c681da
commit 7f09d0b756
80 changed files with 2669 additions and 5187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -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);
}