diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-04-18 14:20:54 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2012-05-09 12:42:44 +0200 |
| commit | 7f09d0b756ff3f9bb52737d4aaf65ed84d751316 (patch) | |
| tree | 7469486e35fd0b6a3e7c4e7e8775f75784c414fd /src/plugins/debugger/debuggerconstants.h | |
| parent | d201c681daae42b005c9ea4f3a1e272ea9cc5ef5 (diff) | |
| download | qt-creator-7f09d0b756ff3f9bb52737d4aaf65ed84d751316.tar.gz | |
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>
Diffstat (limited to 'src/plugins/debugger/debuggerconstants.h')
| -rw-r--r-- | src/plugins/debugger/debuggerconstants.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index efd766b598..0bae1cc79e 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -52,7 +52,7 @@ const char G_MANUAL_REMOTE[] = "Debugger.Group.Manual.Remote"; const char G_AUTOMATIC_REMOTE[] = "Debugger.Group.Automatic.Remote"; const char G_START_QML[] = "Debugger.Group.Start.Qml"; -// Common actions (accessed by QML inspector) +// Common actions const char INTERRUPT[] = "Debugger.Interrupt"; const char CONTINUE[] = "Debugger.Continue"; const char STOP[] = "Debugger.Stop"; @@ -63,6 +63,8 @@ const char STEPOUT[] = "Debugger.StepOut"; const char NEXT[] = "Debugger.NextLine"; const char REVERSE[] = "Debugger.ReverseDirection"; const char OPERATE_BY_INSTRUCTION[] = "Debugger.OperateByInstruction"; +const char QML_SELECTTOOL[] = "Debugger.QmlSelectTool"; +const char QML_ZOOMTOOL[] = "Debugger.QmlZoomTool"; // DebuggerMainWindow dock widget names const char DOCKWIDGET_BREAK[] = "Debugger.Docks.Break"; |