Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						45c9cf7a12 
					 
					
						
						
							
							add/unify i/o error handling  
						
						 
						
						... 
						
						
						
						lots of use of Utils::FileSaver and Utils::FileReader
Task-number: QTCREATORBUG-1619 
						
						
					 
					
						2011-04-18 14:10:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						8397663964 
					 
					
						
						
							
							Update license.  
						
						 
						
						
						
						
					 
					
						2011-04-13 11:49:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leandro Melo 
							
						 
					 
					
						
						
							
						
						ae3b2ab013 
					 
					
						
						
							
							Still changes to our options dialog  
						
						 
						
						... 
						
						
						
						We decided to have text-based buttons by default. 
						
						
					 
					
						2011-02-28 14:42:32 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leandro Melo 
							
						 
					 
					
						
						
							
						
						a5977bc822 
					 
					
						
						
							
							Revert "Make our options dialog a bit more uniform"  
						
						 
						
						... 
						
						
						
						This reverts commit 561f87fcb9 . 
						
						
					 
					
						2011-02-28 14:37:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leandro Melo 
							
						 
					 
					
						
						
							
						
						561f87fcb9 
					 
					
						
						
							
							Make our options dialog a bit more uniform  
						
						 
						
						... 
						
						
						
						In terms of buttons, layouts, aesthetics in general. 
						
						
					 
					
						2011-02-25 16:29:35 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leandro Melo 
							
						 
					 
					
						
						
							
						
						ea313f3ec8 
					 
					
						
						
							
							Text editor: Introduce per project settings  
						
						 
						
						... 
						
						
						
						With some refactorings to make the code look better.
Reviewed-by: con 
						
						
					 
					
						2011-02-21 17:22:24 +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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						a4cbd970e5 
					 
					
						
						
							
							Changed license template reading to use the global default encoding.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-3039
Reviewed-by: con 
						
						
					 
					
						2010-11-11 11:19:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Francois Ferrand 
							
						 
					 
					
						
						
							
						
						3b70e944a3 
					 
					
						
						
							
							Support new keywords %MONTH% and %DAY% for C++ template file.  
						
						 
						
						... 
						
						
						
						Merge-request: 199
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-28 12:13:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								dt 
							
						 
					 
					
						
						
							
						
						08ccda5862 
					 
					
						
						
							
							EditorManager: Change openEditor/activateEditor to not do mode switching  
						
						 
						
						... 
						
						
						
						Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.
That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode 
						
						
					 
					
						2010-09-14 15:23:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						7ab30d8a63 
					 
					
						
						
							
							C++-Settings/License template: Add %FILENAME%, %CLASS% placeholders.  
						
						 
						
						... 
						
						
						
						... for doxygen. Change logic for known empty keywords to be replaced
by an empty string.
Task-number: QTCREATORBUG-1854 
						
						
					 
					
						2010-08-09 12:26:48 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						2d17da65a9 
					 
					
						
						
							
							Icon update.  
						
						 
						
						
						
						
					 
					
						2010-05-18 14:26:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						cf233161fa 
					 
					
						
						
							
							Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.  
						
						 
						
						... 
						
						
						
						Reviewed-by: ossi 
						
						
					 
					
						2010-05-14 15:53:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						662b27153d 
					 
					
						
						
							
							Removed redundant group boxes from options dialog pages  
						
						 
						
						... 
						
						
						
						Reviewed-by: Jens Bache-Wiig 
						
						
					 
					
						2010-04-13 17:33:36 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						2d21060bc9 
					 
					
						
						
							
							Added icons to options dialog categories  
						
						 
						
						... 
						
						
						
						Some categories do not have icons yet, unfortunately. 
						
						
					 
					
						2010-03-26 17:47:31 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						 
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						a6ad773722 
					 
					
						
						
							
							Make method naming more consistent.  
						
						 
						
						... 
						
						
						
						* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.
Reviewed-by: dt 
						
						
					 
					
						2010-01-07 18:17:24 +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 
							
						 
					 
					
						
						
							
						
						65e11062bb 
					 
					
						
						
							
							Polish the settings dialog.  
						
						 
						
						... 
						
						
						
						Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.
Task-number: QTCREATOR-26 
						
						
					 
					
						2009-11-24 15:05:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						e4a7792d6e 
					 
					
						
						
							
							Options dialog: Further polishing.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATOR-26 
						
						
					 
					
						2009-11-20 16:55:23 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						5948e284bb 
					 
					
						
						
							
							Rename namespace Core::Utils into Utils  
						
						 
						
						... 
						
						
						
						Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor. 
						
						
					 
					
						2009-10-05 11:06:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						93cbef8724 
					 
					
						
						
							
							long live the king  
						
						 
						
						
						
						
					 
					
						2009-08-14 09:30:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						acdcf82eae 
					 
					
						
						
							
							Clarify what the dialog in CppFileSettingsWidget::slotEdit() actually does  
						
						 
						
						
						
						
					 
					
						2009-07-28 12:05:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						e51811657b 
					 
					
						
						
							
							No need to open file for reading when just writing to it  
						
						 
						
						
						
						
					 
					
						2009-06-29 14:30:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						2f7b3e1257 
					 
					
						
						
							
							Fix overwriting of new license header template.  
						
						 
						
						
						
						
					 
					
						2009-06-22 16:27:06 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						696cfa0432 
					 
					
						
						
							
							Add a license template setting to the CppTools settings.  
						
						 
						
						... 
						
						
						
						Acked-by: con <qtc-committer@nokia.com > 
						
						
					 
					
						2009-06-22 16:22:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jason McDonald 
							
						 
					 
					
						
						
							
						
						884b7af769 
					 
					
						
						
							
							Update license headers and sales contact details.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Trust Me 
						
						
					 
					
						2009-06-17 00:01:27 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						5740bd6410 
					 
					
						
						
							
							Made cpp file suffixes take effect after restart.  
						
						 
						
						... 
						
						
						
						In CppTools, keep cpp file settings in plugin and settings page
via shared pointer and apply to mime DB in
extensionsInitialized() (after CppEditor has loaded
and registered the mime types).
Task-number: 252299 
						
						
					 
					
						2009-04-29 09:04:59 +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