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  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						7503d1bcf6 
					 
					
						
						
							
							Silence doc warnings, apply new Qt docs layout, add CVS to RCSes.  
						
						 
						
						
						
						
					 
					
						2009-08-31 15:20:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						8c41eddaf4 
					 
					
						
						
							
							Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline  
						
						 
						
						
						
						
					 
					
						2009-06-09 18:38:52 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						ab42bb6679 
					 
					
						
						
							
							Replace Addressbook tutorial from Qt with the version for Creator  
						
						 
						
						... 
						
						
						
						Reviewed-By: Thorbjorn Lindeijer 
						
						
					 
					
						2009-06-09 18:15:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						57cd26548e 
					 
					
						
						
							
							Version bump also in master.  
						
						 
						
						
						
						
					 
					
						2009-06-04 11:00:28 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						e9b2613dc0 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2009-06-02 15:34:58 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						423744e4e1 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2009-04-08 11:47:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						de6a0cfea9 
					 
					
						
						
							
							Version bump.  
						
						 
						
						
						
						
					 
					
						2009-04-08 11:45:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						a68f604965 
					 
					
						
						
							
							Doc - Moving all the images to a doc/images folder instead of leaving  
						
						 
						
						... 
						
						
						
						them lying around in the doc folder. 
						
						
					 
					
						2009-04-02 10:34:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								hjk 
							
						 
					 
					
						
						
							
						
						6aeb8a764b 
					 
					
						
						
							
							more fixes to the textfinder example documentation  
						
						 
						
						
						
						
					 
					
						2009-03-24 17:57:43 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						a155cec18f 
					 
					
						
						
							
							Fixes:    Bump Creator version after release  
						
						 
						
						... 
						
						
						
						Task:     -
RevBy:    Thorbjorn
AutoTest: - 
						
						
					 
					
						2009-03-04 12:46:05 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						fadcd2a935 
					 
					
						
						
							
							Fixes:    - Update year  
						
						 
						
						
						
						
					 
					
						2009-03-03 17:23:45 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						523f74e838 
					 
					
						
						
							
							Fixes:    - Updated version number  
						
						 
						
						
						
						
					 
					
						2009-02-24 12:29:27 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								goro 
							
						 
					 
					
						
						
							
						
						54f6f814c8 
					 
					
						
						
							
							Extend version bump script, bump docs to 0.9.2  
						
						 
						
						
						
						
					 
					
						2009-01-23 17:13:18 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						64a4f93775 
					 
					
						
						
							
							Fixes:    - Known Issues and version in footer  
						
						 
						
						
						
						
					 
					
						2008-12-17 16:34:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						05c35356ab 
					 
					
						
						
							
							Initial import  
						
						 
						
						
						
						
					 
					
						2008-12-02 12:01:29 +01:00