Tobias Hunger 
							
						 
					 
					
						
						
							
						
						aa2acec14c 
					 
					
						
						
							
							Fix/add copyright headers  
						
						 
						
						... 
						
						
						
						Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2 
						
						
					 
					
						2011-05-06 15:17:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						dc3c156cac 
					 
					
						
						
							
							Merge branch '2.2'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp 
						
						
					 
					
						2011-04-14 12:39:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jarek Kobus 
							
						 
					 
					
						
						
							
						
						4d69c7455e 
					 
					
						
						
							
							Remove unused constants, fix lacking virtual destructor  
						
						 
						
						... 
						
						
						
						Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com > 
						
						
					 
					
						2011-04-14 12:08:47 +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 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						 
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						39a03d2505 
					 
					
						
						
							
							C++ Editor: Moved refactoring actions into sub-menu.  
						
						 
						
						
						
						
					 
					
						2010-09-15 14:35:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						2d17da65a9 
					 
					
						
						
							
							Icon update.  
						
						 
						
						
						
						
					 
					
						2010-05-18 14:26:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						 
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						a8ac34c347 
					 
					
						
						
							
							Options: Sort by category, id.  
						
						 
						
						... 
						
						
						
						Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name. 
						
						
					 
					
						2009-11-27 16:12:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						bf73896928 
					 
					
						
						
							
							SettingsDialog: Polish  
						
						 
						
						... 
						
						
						
						Use QGridLayout to align header label and QStackedLayout for the pages
(in code, as it is not available in Designer).
Derive new class FilterLineEdit for filter widgets based on a modified
version of FancyLineEdit and use that in settings.
Rubber-stamped-by: con <qtc-committer@nokia.com > 
						
						
					 
					
						2009-11-27 13:54:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						9b501d6369 
					 
					
						
						
							
							Use TASK_SEARCH instead of TASK_INDEX.  
						
						 
						
						
						
						
					 
					
						2009-09-23 16:52:42 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						93cbef8724 
					 
					
						
						
							
							long live the king  
						
						 
						
						
						
						
					 
					
						2009-08-14 09:30:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason McDonald 
							
						 
					 
					
						
						
							
						
						884b7af769 
					 
					
						
						
							
							Update license headers and sales contact details.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Trust Me 
						
						
					 
					
						2009-06-17 00:01:27 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						0d8456a73e 
					 
					
						
						
							
							Some capitalization fixes  
						
						 
						
						
						
						
					 
					
						2009-06-11 15:14:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						9ba5a81e9b 
					 
					
						
						
							
							Switch header source between .h and .mm files.  
						
						 
						
						
						
						
					 
					
						2009-05-04 17:11:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						70cf2c76a5 
					 
					
						
						
							
							Fixes: Use common default for lower casing file names  
						
						 
						
						
						
						
					 
					
						2009-03-18 17:05:48 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						bccf4a1fc3 
					 
					
						
						
							
							Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.  
						
						 
						
						... 
						
						
						
						Task: 241959, 248085
RevBy: Optics/Naming checked by con
Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings. 
						
						
					 
					
						2009-03-18 16:43:01 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						8ca887aae2 
					 
					
						
						
							
							Fixes:    change file license headers to include LGPL  
						
						 
						
						
						
						
					 
					
						2009-02-25 09:15:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						59affcfffc 
					 
					
						
						
							
							Bump year in licence header.  
						
						 
						
						
						
						
					 
					
						2009-01-13 19:22:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						da3cb14483 
					 
					
						
						
							
							chancge Nokia GPL exception version from 1.2 to 1.3  
						
						 
						
						
						
						
					 
					
						2008-12-16 17:20:00 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						df7aacd637 
					 
					
						
						
							
							more file cosmetics  
						
						 
						
						
						
						
					 
					
						2008-12-02 15:08:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						ab83dcd87c 
					 
					
						
						
							
							off-by-one in headers  
						
						 
						
						
						
						
					 
					
						2008-12-02 14:20:25 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						8a43d9b9f3 
					 
					
						
						
							
							end-of-line whitespace correction of the new headers  
						
						 
						
						
						
						
					 
					
						2008-12-02 14:17:16 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						05c35356ab 
					 
					
						
						
							
							Initial import  
						
						 
						
						
						
						
					 
					
						2008-12-02 12:01:29 +01:00