Erik Verbruggen
							
						 
					 | 
					
						
						
							
						
						b9b117aabb
					 | 
					
						
						
							
							Fixed testcases.
						
						
						
						
						
						
						
						Change-Id: Ia20094acbadcb6bec921ec77751f2c73a94e05cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> 
						
						
					 | 
					
						2012-02-09 13:59:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hjk
							
						 
					 | 
					
						
						
							
						
						2931a499e6
					 | 
					
						
						
							
							Long live the king!
						
						
						
						
						
						
						
						Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com> 
						
						
					 | 
					
						2012-01-26 19:55:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hjk
							
						 
					 | 
					
						
						
							
						
						31600758de
					 | 
					
						
						
							
							all: s/info@qt.nokia.com/qt-info@nokia.com/
						
						
						
						
						
						
						
						Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com> 
						
						
					 | 
					
						2011-11-03 10:33:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Erik Verbruggen
							
						 
					 | 
					
						
						
							
						
						b3237d7d42
					 | 
					
						
						
							
							Fixed (C)opyright headers.
						
						
						
						
						
						
						
						Change-Id: I755bdd1788770b7edd34f06372219d27abd0af11
Reviewed-on: http://codereview.qt.nokia.com/1214
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> 
						
						
					 | 
					
						2011-07-06 11:57:21 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hjk
							
						 
					 | 
					
						
						
							
						
						8397663964
					 | 
					
						
						
							
							Update license.
						
						
						
						
						
						
					 | 
					
						2011-04-13 11:49:28 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						d1023c7614
					 | 
					
						
						
							
							It's 2011 now.
						
						
						
						
						
						
						
						Reviewed-by: hjk 
						
						
					 | 
					
						2011-01-12 09:46:24 +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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Kamm
							
						 
					 | 
					
						
						
							
						
						1920372280
					 | 
					
						
						
							
							Move ast dump tools from tests/manual to tests/tools.
						
						
						
						
						
						
						
						Reviewed-by: Friedemann Kleint 
						
						
					 | 
					
						2010-11-05 09:25:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |