forked from qt-creator/qt-creator
		
	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>
This commit is contained in:
		@@ -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";
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user