diff options
| author | Kai Koehne <[email protected]> | 2012-04-18 14:20:54 +0200 |
|---|---|---|
| committer | Kai Koehne <[email protected]> | 2012-05-09 12:42:44 +0200 |
| commit | 7f09d0b756ff3f9bb52737d4aaf65ed84d751316 (patch) | |
| tree | 7469486e35fd0b6a3e7c4e7e8775f75784c414fd /src/plugins/debugger/debuggerengine.cpp | |
| parent | d201c681daae42b005c9ea4f3a1e272ea9cc5ef5 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/plugins/debugger/debuggerengine.cpp')
| -rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 563b5d248e4..e838dbed96b 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -513,6 +513,14 @@ QAbstractItemModel *DebuggerEngine::returnModel() const return model; } +QAbstractItemModel *DebuggerEngine::inspectorModel() const +{ + QAbstractItemModel *model = watchHandler()->model(InspectWatch); + if (model->objectName().isEmpty()) // Make debugging easier. + model->setObjectName(objectName() + QLatin1String("InspectorModel")); + return model; +} + QAbstractItemModel *DebuggerEngine::toolTipsModel() const { QAbstractItemModel *model = watchHandler()->model(TooltipsWatch); |