Christian Kandeler 
							
						 
					 
					
						
						
							
						
						5c9f175133 
					 
					
						
						
							
							qbs build: Make the autotest template available as an import.  
						
						 
						
						... 
						
						
						
						Just like for QtcPlugin, QtcLibrary etc.
Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com > 
						
						
					 
					
						2014-05-08 11:01:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						746c5d8863 
					 
					
						
						
							
							Incremented year in copyright info  
						
						 
						
						... 
						
						
						
						Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2014-01-08 08:29:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						698144e32e 
					 
					
						
						
							
							Add qbs project files for autotests.  
						
						 
						
						... 
						
						
						
						Note: Since not all autotests are able to run from an installed location,
we need to be able to start them from the build directory, which
in turn forces us to set a destination directory for libraries and plugins,
so they will be found at run-time.
Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com > 
						
						
					 
					
						2013-09-09 12:16:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						66a3553107 
					 
					
						
						
							
							make library and plugin dependencies declarative  
						
						 
						
						... 
						
						
						
						instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.
Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com > 
						
						
					 
					
						2013-04-03 14:37:45 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						3893bb13b4 
					 
					
						
						
							
							fix include style and remove subsequently redundant INCLUDEPATHs  
						
						 
						
						... 
						
						
						
						Change-Id: I9e6950d30c7a65229559c7046a7cc8c903964065
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2013-04-02 17:09:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Loehning 
							
						 
					 
					
						
						
							
						
						298531e370 
					 
					
						
						
							
							Incremented year in copyright info  
						
						 
						
						... 
						
						
						
						Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com > 
						
						
					 
					
						2013-01-29 16:27:03 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						386ca7c8dd 
					 
					
						
						
							
							Adjust license headers  
						
						 
						
						... 
						
						
						
						Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com > 
						
						
					 
					
						2012-10-05 17:12:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Eike Ziller 
							
						 
					 
					
						
						
							
						
						e0e8cf3ada 
					 
					
						
						
							
							Contact -> qt-project.org  
						
						 
						
						... 
						
						
						
						Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2012-07-19 13:23:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						3fa55b7ab9 
					 
					
						
						
							
							Removed module names from #include directives.  
						
						 
						
						... 
						
						
						
						Getting the #include directives ready for Qt5. This includes the
new-project wizards.
Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com > 
						
						
					 
					
						2012-02-15 16:24:46 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						36c72ac388 
					 
					
						
						
							
							Tests: More autotest cleanup.  
						
						 
						
						
						
						
					 
					
						2011-02-16 17:09:20 +01: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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						 
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						9bd95ade08 
					 
					
						
						
							
							add generic macro expansion classes & functions to Utils  
						
						 
						
						... 
						
						
						
						AbstractMacroExpander (any macros), AbstractQtcMacroExpander (%{var}
style macros, which is a hybrid of printf format specifiers and unix
environment expansions) and expandMacros() for the actual string
manipulation. 
						
						
					 
					
						2010-11-17 13:19:06 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						42c083cd5a 
					 
					
						
						
							
							tests: fixes compile  
						
						 
						
						
						
						
					 
					
						2010-11-04 10:06:06 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						2c84d4c9d6 
					 
					
						
						
							
							tests: more autotest cleanup  
						
						 
						
						
						
						
					 
					
						2010-11-01 13:58:04 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						524a9ac4a8 
					 
					
						
						
							
							tests: more test project cleanup  
						
						 
						
						
						
						
					 
					
						2010-10-21 14:49:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						d95f3324c7 
					 
					
						
						
							
							tests: remove unnecessary TARGET = tst_$$TARGET  
						
						 
						
						... 
						
						
						
						"CONFIG += testcase" does this for us, and is the proper way to do this. 
						
						
					 
					
						2010-10-20 15:03:01 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						eb498ee428 
					 
					
						
						
							
							Tests: some cleanup of pro files, marking of tested components.  
						
						 
						
						
						
						
					 
					
						2010-09-06 14:19:32 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						352b491c87 
					 
					
						
						
							
							On Linux/Mac, show home path as ~ in recent projects.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Daniel Molkentin 
						
						
					 
					
						2010-07-14 14:45:18 +02:00