| 
							
							
								 hjk | a322bd606f | Replace qt-info@nokia.com with info@qt.nokia.com Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com> | 2011-07-06 11:14:01 +02:00 |  | 
			
				
					| 
							
							
								 hjk | 8397663964 | Update license. | 2011-04-13 11:49:28 +02:00 |  | 
			
				
					| 
							
							
								 Friedemann Kleint | 6b153c8747 | Tests: Fix compilation/plugin test. | 2011-01-20 14:43:06 +01:00 |  | 
			
				
					| 
							
							
								 con | d1023c7614 | It's 2011 now. Reviewed-by: hjk | 2011-01-12 09:46:24 +01:00 |  | 
			
				
					| 
							
							
								 Christian Kamm | 16542241c9 | C++: Add parsing of Q_PRIVATE_PROPERTY. Reviewed-by: Roberto Raggi | 2011-01-04 15:58:22 +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 |  | 
			
				
					| 
							
							
								 Roberto Raggi | 88fe5a50a1 | Added semantic checks for stray semicolons and topldevel empty declarations. | 2010-12-16 12:26:12 +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 |  |