Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						853194370f 
					 
					
						
						
							
							use qt's qdoc templates when building against qt5  
						
						 
						
						... 
						
						
						
						Change-Id: Id49e7808b0e8e83c54d573766fcb8c25bfe6728b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com > 
						
						
					 
					
						2013-02-15 11:35:22 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Boddie 
							
						 
					 
					
						
						
							
						
						a20cd34863 
					 
					
						
						
							
							Updated the configuration files to use the updated qdoc.  
						
						 
						
						... 
						
						
						
						Updated qdoc to remove hard-coded dependencies on style sheets.
Simplified the offline documentation, introducing an offline.css
file to be used for documentation in Qt Creator. 
						
						
					 
					
						2011-02-11 08:40:55 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						f46a87a6f5 
					 
					
						
						
							
							Merge remote branch 'origin/2.1'  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp 
						
						
					 
					
						2011-01-12 10:20:46 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						9a7e4865a5 
					 
					
						
						
							
							Doc: change SDK name to Qt SDK  
						
						 
						
						
						
						
					 
					
						2011-01-11 17:16:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						a9c803d310 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2010-12-02 10:38:04 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						61ebb308e6 
					 
					
						
						
							
							Merge commit 'bd8b23d4bad4191367e7c5eb3297769a2477afec' (origin/2.1)  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp 
						
						
					 
					
						2010-11-25 17:36:50 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						2f79abcc45 
					 
					
						
						
							
							Doc: change the SDK name to Nokia Qt SDK  
						
						 
						
						... 
						
						
						
						Reviewed-by: Robert Loehning 
						
						
					 
					
						2010-11-24 13:20:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						f3b5c98bf5 
					 
					
						
						
							
							Merge remote branch 'origin/2.1'  
						
						 
						
						
						
						
					 
					
						2010-11-23 15:44:58 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						33ac00afbe 
					 
					
						
						
							
							Doc: replace Qt SDK product name with a macro  
						
						 
						
						... 
						
						
						
						Reviewed-by: Oswald Buddenhagen 
						
						
					 
					
						2010-11-19 16:22:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						9532d4a345 
					 
					
						
						
							
							dynamically replace creator version during build  
						
						 
						
						... 
						
						
						
						... instead of running a sed script over a lot of files on each
version increment. 
						
						
					 
					
						2010-11-03 17:47:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						d7216e84cc 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2010-11-02 11:15:12 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						880312c549 
					 
					
						
						
							
							version bump: 2.0.92 -> 2.0.93  
						
						 
						
						
						
						
					 
					
						2010-10-08 13:50:04 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						4f05687ed0 
					 
					
						
						
							
							version bump: 2.0.91 -> 2.0.92  
						
						 
						
						
						
						
					 
					
						2010-10-07 15:05:56 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						e6dd3ff5f0 
					 
					
						
						
							
							version bump 2.0.91 -> 2.1.81  
						
						 
						
						... 
						
						
						
						Should have been done earlier. 2.1.80 was burned in the pre-2.1.0->2.0.1
days, and we'd like to have odd subminor for 'working' and even subminor
numbers for pure cherry-picking release branches anyway. 
						
						
					 
					
						2010-09-30 13:49:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						4389f02097 
					 
					
						
						
							
							version bump 2.0.90 -> 2.0.91  
						
						 
						
						
						
						
					 
					
						2010-09-27 16:57:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Morten Engvoldsen 
							
						 
					 
					
						
						
							
						
						9476add6c6 
					 
					
						
						
							
							Doc: Updated qdocconf files, style and template.  
						
						 
						
						
						
						
					 
					
						2010-09-06 18:41:17 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						63bc8a0050 
					 
					
						
						
							
							replace version 2.1.80 by 2.0.90  
						
						 
						
						
						
						
					 
					
						2010-08-30 10:38:38 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						ef1e52dfd1 
					 
					
						
						
							
							Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h 
						
						
					 
					
						2010-08-23 16:00:24 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						2d9451341d 
					 
					
						
						
							
							Doc - Pull out instructions for setting up development environments for Maemo and Symbian, to reuse the topics in Nokia Qt SDK documentation (with if defines)  
						
						 
						
						
						
						
					 
					
						2010-08-20 16:42:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						0cba8a2e11 
					 
					
						
						
							
							Add missing assets to qch file  
						
						 
						
						... 
						
						
						
						Reviewed-by: Alessandro Portale 
						
						
					 
					
						2010-08-19 12:23:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						6bd790bd0f 
					 
					
						
						
							
							Version bump  
						
						 
						
						
						
						
					 
					
						2010-07-22 18:05:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						c3594213fd 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc 
						
						
					 
					
						2010-07-13 11:34:44 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						d24d01f49c 
					 
					
						
						
							
							Merge commit '52b9fcca2ddd5d5e95c6e13cbded018699c7dd68' (origin/2.0)  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemosshthread.h 
						
						
					 
					
						2010-07-13 11:31:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						c95c3d9509 
					 
					
						
						
							
							Doc - Add variable to generate docs for Qt Creator.  
						
						 
						
						
						
						
					 
					
						2010-07-12 11:37:09 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						0fbc6f6402 
					 
					
						
						
							
							Doc - Add a template image  
						
						 
						
						
						
						
					 
					
						2010-07-07 10:38:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						6503099bec 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	src/plugins/bineditor/bineditorplugin.cpp 
						
						
					 
					
						2010-07-05 13:54:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						73209d1056 
					 
					
						
						
							
							Doc - Implement fix to the TOC structure in Documentation by David Boddie.  
						
						 
						
						
						
						
					 
					
						2010-07-02 17:17:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						af44136e22 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp 
						
						
					 
					
						2010-06-24 11:40:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						29333c18fc 
					 
					
						
						
							
							Fix more glitches in the online version of the docs  
						
						 
						
						... 
						
						
						
						- sprites_combined was too old (pull from Qt)
- page.png asset was not copied and used
- style.css was improved
  - don't show bullets for numbered lists
  - vertically center <img>s in ul or ol environment
  - don't specify widths for the module name
Reviewed-By: Leena Miettinen 
						
						
					 
					
						2010-06-22 11:02:20 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						458a25efa9 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp 
						
						
					 
					
						2010-06-18 16:54:37 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						c7db4a09c8 
					 
					
						
						
							
							Sync doc style with Qt, introduce online version (make docs_online)  
						
						 
						
						... 
						
						
						
						The spacing errors come from Qt, and should be fixed there.
Reviewed-By: Oswald Buddenhagen 
						
						
					 
					
						2010-06-15 15:02:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						2e10016210 
					 
					
						
						
							
							Version update to match the planned version naming.  
						
						 
						
						
						
						
					 
					
						2010-06-11 16:41:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						9250d0007d 
					 
					
						
						
							
							Version update to match the planned version naming.  
						
						 
						
						
						
						
					 
					
						2010-06-11 16:37:10 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						d326c16747 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2010-06-07 13:45:49 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						aa28e042ea 
					 
					
						
						
							
							Fix help being unusable in split mode by using Qt doc offline style  
						
						 
						
						... 
						
						
						
						Reviewed-by: Leena Miettinen 
						
						
					 
					
						2010-06-04 14:43:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						e327467a03 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h 
						
						
					 
					
						2010-05-21 16:04:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						e18f2e00c7 
					 
					
						
						
							
							Doc - Update Qt QML Viewer product name (using a macro). Update screen shots.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Kai Koehne
Reviewed-by: Lasse Holmstedt 
						
						
					 
					
						2010-05-21 12:21:55 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						ab309f31e4 
					 
					
						
						
							
							Applying the new layout (slightly modified) to the Qt Creator docs.  
						
						 
						
						... 
						
						
						
						Reviewed-By: Leena Miettinen 
						
						
					 
					
						2010-05-04 16:16:47 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						9d9f2ed3a6 
					 
					
						
						
							
							Applying the new layout (slightly modified) to the Qt Creator docs.  
						
						 
						
						... 
						
						
						
						Reviewed-By: Leena Miettinen 
						
						
					 
					
						2010-05-04 16:08:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						84d9b647ee 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2010-04-30 11:58:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						ded5ed975a 
					 
					
						
						
							
							Version bump  
						
						 
						
						
						
						
					 
					
						2010-03-31 18:06:02 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						1696ae48e0 
					 
					
						
						
							
							Add design guidelines for mobile applications. Fix keyboard shortcuts.  
						
						 
						
						
						
						
					 
					
						2010-03-31 17:17:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						6d68cbcbc5 
					 
					
						
						
							
							Edit introduction to Quick Designer. Change product name to Quick Designer. Change terminology (widget becomes component). Update and add information about using Quick Designer. Update and add images.  
						
						 
						
						
						
						
					 
					
						2010-03-31 17:17:31 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						8506883854 
					 
					
						
						
							
							Implement review comments. Add initial information about QML Designer. Fix typos. Fix capitalization. Use macros for product names.  
						
						 
						
						
						
						
					 
					
						2010-03-12 17:18:02 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						 
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						58703ba73d 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2010-03-01 17:57:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						b19d76d903 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2009-10-02 16:27:03 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						1de6a6e716 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2009-10-02 16:21:39 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						32e0340eab 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2009-09-10 17:02:57 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						677c78dccd 
					 
					
						
						
							
							Clean up the index page a bit.  
						
						 
						
						
						
						
					 
					
						2009-08-31 16:17:06 +02:00