con 
							
						 
					 
					
						
						
							
						
						d1023c7614 
					 
					
						
						
							
							It's 2011 now.  
						
						 
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2011-01-12 09:46:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						a7eccce733 
					 
					
						
						
							
							Debugger: Header cleanup  
						
						 
						
						
						
						
					 
					
						2011-01-10 10:14:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						b1bcf081d8 
					 
					
						
						
							
							Merge branch '2.1'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp 
						
						
					 
					
						2010-12-17 17:00:53 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						 
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						ee6bf38ea2 
					 
					
						
						
							
							Maemo: Fix remote debugging.  
						
						 
						
						... 
						
						
						
						Was broken by 77e3bfe845 . 
						
						
					 
					
						2010-12-15 16:51:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						77e3bfe845 
					 
					
						
						
							
							debugger: structural cleanup remote debugging  
						
						 
						
						... 
						
						
						
						Use virtual function instead of if/qobject_cast cascades. 
						
						
					 
					
						2010-12-10 12:42:40 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						2e09df3d9c 
					 
					
						
						
							
							ToolChain: Rename RVCT toolchains to RVCT2  
						
						 
						
						... 
						
						
						
						Reviewed-by: dt 
						
						
					 
					
						2010-11-26 15:07:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						3488b0446c 
					 
					
						
						
							
							debugger: fix state after error output to -exec-interrupt  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2850 
						
						
					 
					
						2010-11-26 14:26:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						1eeb35cfdd 
					 
					
						
						
							
							debugger: cosmetics  
						
						 
						
						
						
						
					 
					
						2010-11-26 14:26:51 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						1e362b0f8b 
					 
					
						
						
							
							overhaul process argument handling  
						
						 
						
						... 
						
						
						
						get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.
Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564 
						
						
					 
					
						2010-11-17 13:19:07 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						8ae541b36f 
					 
					
						
						
							
							debugger: Refactor breakpoint handling.  
						
						 
						
						... 
						
						
						
						The breakpoints are now (fairly) tightly guarded by the BreakpointHandler.
Engines and Views are only supposed to refer to them by id. They also have
individual states now. The breakpoint data is split into a "user requested"
"fixed" part in BreakpointData and the engines' acknowledged data in a new
struct BreakpointResponse.
TODO: Move m_state and m_engine members to BreakpointResponse. Fix regressions
in the marker handling. 
						
						
					 
					
						2010-11-15 12:09:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						22f03cbde6 
					 
					
						
						
							
							ProjectExplor/Debugger: Header cleanup  
						
						 
						
						
						
						
					 
					
						2010-11-02 16:14:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						548df9385b 
					 
					
						
						
							
							Maemo: Use dynamic port list.  
						
						 
						
						... 
						
						
						
						Check whether the ports we need are actually available on the device.
As a side effect, this makes it possible to debug more than one
application at the same time on Maemo.
Task-number: QTCREATORBUG-2702 
						
						
					 
					
						2010-11-02 14:27:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						6510a749b7 
					 
					
						
						
							
							ProjectExplorer: Move ToolChainType enumeration into separate Header.  
						
						 
						
						... 
						
						
						
						Acked-By: dt 
						
						
					 
					
						2010-11-01 14:25:24 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						0bea245745 
					 
					
						
						
							
							Debugger/Remote Debugging: Add "GNU target" start parameter.  
						
						 
						
						... 
						
						
						
						This is needed for multi-architecture gdb.
Reviewed-by: hjk 
						
						
					 
					
						2010-10-29 14:14:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						1dab238307 
					 
					
						
						
							
							debugger: add some comment on 'set target-async' weirdness  
						
						 
						
						
						
						
					 
					
						2010-09-08 11:54:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						a364b93577 
					 
					
						
						
							
							debugger: allow state transition EngineShutdownRequested -> EngineShutdownFailed  
						
						 
						
						
						
						
					 
					
						2010-09-07 13:22:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						715e72117d 
					 
					
						
						
							
							debugger: remove one of the three failure notification if a gdb binary is  
						
						 
						
						... 
						
						
						
						not found with the remote adapter 
						
						
					 
					
						2010-09-06 15:14:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						0e2a7608f2 
					 
					
						
						
							
							debugger: fix remote adapter startup  
						
						 
						
						
						
						
					 
					
						2010-09-06 11:36:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9cbbeec6c1 
					 
					
						
						
							
							debugger: move convienience function to DebuggerEngine base class  
						
						 
						
						
						
						
					 
					
						2010-07-21 14:28:29 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						af57dc4170 
					 
					
						
						
							
							debugger: re-enable setting breakpoints while inferior is running  
						
						 
						
						
						
						
					 
					
						2010-07-20 14:02:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ck 
							
						 
					 
					
						
						
							
						
						08bc6c0027 
					 
					
						
						
							
							Maemo: Get rid of MaemoDebugRunControl.  
						
						 
						
						... 
						
						
						
						Use Debugger::DebuggerRunControl directly instead of wrapping it
into another RunControl.
Reviewed-by: hjk 
						
						
					 
					
						2010-07-15 17:01:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						02f85a9949 
					 
					
						
						
							
							debugger: adjust maemo adapter to new architecture  
						
						 
						
						
						
						
					 
					
						2010-07-14 17:49:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						3eef8a43c0 
					 
					
						
						
							
							debugger: more state work  
						
						 
						
						
						
						
					 
					
						2010-07-14 17:49:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						e760700f0f 
					 
					
						
						
							
							debugger: overhaul "state machine"  
						
						 
						
						... 
						
						
						
						This mainly allows for more precise shutdown and tightens the set
of allowed transitions. 
						
						
					 
					
						2010-07-14 17:49:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						6089bc1b9e 
					 
					
						
						
							
							debugger: rename EngineStart to EngineSetup  
						
						 
						
						
						
						
					 
					
						2010-07-14 17:49:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9e7a456457 
					 
					
						
						
							
							debugger: refactor startup logic  
						
						 
						
						
						
						
					 
					
						2010-07-14 17:49:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						405f340e2b 
					 
					
						
						
							
							debugger: streamline communication between GdbEngine and the adapters  
						
						 
						
						
						
						
					 
					
						2010-07-08 12:41:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						2385e15b2d 
					 
					
						
						
							
							debugger: merge 'AdapterStarting' into 'EngineStarting' state  
						
						 
						
						
						
						
					 
					
						2010-07-08 12:41:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9f7e9dc0ae 
					 
					
						
						
							
							debugger: refactoring of output channeling  
						
						 
						
						
						
						
					 
					
						2010-06-14 18:22:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						b3aff6b919 
					 
					
						
						
							
							debugger: more of the RunControl refactoring  
						
						 
						
						... 
						
						
						
						Pass output through the RunControl instead of the DebuggerManager. 
						
						
					 
					
						2010-06-14 17:24:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ck 
							
						 
					 
					
						
						
							
						
						ef7c5fae60 
					 
					
						
						
							
							Debugger: Support running GDB over SSH.  
						
						 
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2010-05-05 12:51:21 +02:00