Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						bd16eeef9d
					 | 
					
						
						
							
							Merge branch 'docs'
						
						
						
						
						
						
						
						Conflicts:
	doc/qtcreator.qdoc 
						
						
					 | 
					
						2010-03-12 18:33:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						16f7ed26df
					 | 
					
						
						
							
							Add Getting Started section with Creating an Animated Application section. Add screenshots.
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rohan Shetty
							
						 
					 | 
					
						
						
							
						
						54eb2c6339
					 | 
					
						
						
							
							Content added to the section Setting Up a CMake Project
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01: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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rohan Shetty
							
						 
					 | 
					
						
						
							
						
						8f20c52f48
					 | 
					
						
						
							
							Changes made to the Debugger section as per comments and Setting the Symbol Server section added
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						e11b434ee0
					 | 
					
						
						
							
							Add missing screenshots. Fix link to a screenshot.
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						d1464aeede
					 | 
					
						
						
							
							Update the Writing a Simple Project section. Update screenshots. Update the Adding Plugin Section according to review comments by Martin Pejcoch.
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rohan Shetty
							
						 
					 | 
					
						
						
							
						
						b56d33abd2
					 | 
					
						
						
							
							Corrections made in the sections Developing Maemo Applications and Keyboard Shortcuts
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						c75141923c
					 | 
					
						
						
							
							Update the Adding Plugins topic (now Adding Qt Creator Plugins) according to review comments.
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						94355ea014
					 | 
					
						
						
							
							Add link to Creating and Using Components for Qt Designer.
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						856d617b18
					 | 
					
						
						
							
							Add Adding Plugins section
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rohan Shetty
							
						 
					 | 
					
						
						
							
						
						3953c250bf
					 | 
					
						
						
							
							Document changes as per doc comments
						
						
						
						
						
						
					 | 
					
						2010-03-12 17:18:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer
							
						 
					 | 
					
						
						
							
						
						c2563c04c5
					 | 
					
						
						
							
							Some documentation updates and fixes
						
						
						
						
						
						
						
						Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> 
						
						
					 | 
					
						2010-03-12 16:57:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								David Boddie
							
						 
					 | 
					
						
						
							
						
						9b365395dc
					 | 
					
						
						
							
							Fixed typo.
						
						
						
						
						
						
						
						Reviewed-by: Trust Me 
						
						
					 | 
					
						2010-03-05 14:32:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						58703ba73d
					 | 
					
						
						
							
							Version bump.
						
						
						
						
						
						
					 | 
					
						2010-03-01 17:57:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						945f5cd0ad
					 | 
					
						
						
							
							doc fixes
						
						
						
						
						
						
					 | 
					
						2010-02-23 17:46:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						fa41f1e6dc
					 | 
					
						
						
							
							Rewrote information about renaming
						
						
						
						
						
						
					 | 
					
						2010-02-23 17:46:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Leena Miettinen
							
						 
					 | 
					
						
						
							
						
						aabdfdae3f
					 | 
					
						
						
							
							Add introduction chapter
						
						
						
						
						
						
					 | 
					
						2010-02-23 17:46:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						9004dc41e5
					 | 
					
						
						
							
							major doc update
						
						
						
						
						
						
						
						squashed patch series from Mladen Zagorac and Rohan Shetty
who are working under contract. 
						
						
					 | 
					
						2010-02-23 17:46:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dt
							
						 
					 | 
					
						
						
							
						
						3c99f02bcb
					 | 
					
						
						
							
							Rename QMake to qmake since that's the official spelling.
						
						
						
						
						
						
					 | 
					
						2010-02-17 16:54:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thorbjørn Lindeijer
							
						 
					 | 
					
						
						
							
						
						9b3dd396be
					 | 
					
						
						
							
							Merge branch '1.3'
						
						
						
						
						
						
						
						Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp 
						
						
					 | 
					
						2010-02-04 15:09:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Alexander Antsev
							
						 
					 | 
					
						
						
							
						
						1d6c5d73d9
					 | 
					
						
						
							
							Fixed errors in description of locator's key combinations
						
						
						
						
						
						
						
						Merge-request: 108
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com> 
						
						
					 | 
					
						2010-02-01 17:52:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						75b42f18d8
					 | 
					
						
						
							
							Merge remote branch 'origin/1.3'
						
						
						
						
						
						
						
						Trailing whitespace removal re-applied manually. 
						
						
					 | 
					
						2010-01-29 22:50:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kh1
							
						 
					 | 
					
						
						
							
						
						9a01b634a3
					 | 
					
						
						
							
							* Add missing doc about Botan source location.
						
						
						
						
						
						
					 | 
					
						2010-01-21 11:20:52 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kh1
							
						 
					 | 
					
						
						
							
						
						a601819105
					 | 
					
						
						
							
							Add license acknowledgement for botan and net7ssh.
						
						
						
						
						
						
					 | 
					
						2010-01-13 14:47:02 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						2e495e7075
					 | 
					
						
						
							
							Version bump.
						
						
						
						
						
						
					 | 
					
						2010-01-07 18:17:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hjk
							
						 
					 | 
					
						
						
							
						
						6596391811
					 | 
					
						
						
							
							debugger: some documentation on how to use python for creating debugging
						
						
						
						
						
						
						
						helpers for custom types 
						
						
					 | 
					
						2009-12-15 09:50:18 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						7081a3d415
					 | 
					
						
						
							
							Merge remote branch 'origin/1.3'
						
						
						
						
						
						
						
						Conflicts:
	src/plugins/projectexplorer/outputwindow.cpp 
						
						
					 | 
					
						2009-12-14 11:47:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						bdde628374
					 | 
					
						
						
							
							Add some information about supported debugger on Mac OS X.
						
						
						
						
						
						
					 | 
					
						2009-12-11 16:37:46 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								mae
							
						 
					 | 
					
						
						
							
						
						c1120587a8
					 | 
					
						
						
							
							Merge commit 'origin/1.3'
						
						
						
						
						
						
						
						Conflicts:
	src/plugins/cppeditor/cppeditor.cpp 
						
						
					 | 
					
						2009-12-03 18:41:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						3ef326369c
					 | 
					
						
						
							
							Updated supported platforms.
						
						
						
						
						
						
					 | 
					
						2009-12-03 18:31:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						b0b5bde2e9
					 | 
					
						
						
							
							Merge remote branch 'origin/1.3'
						
						
						
						
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/watchhandler.cpp 
						
						
					 | 
					
						2009-11-27 20:06:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						32dd4567c8
					 | 
					
						
						
							
							doc updates
						
						
						
						
						
						
						
						mostly reshuffling and language fixes
the bulk of the work was done by Others Than Me (TM). 
						
						
					 | 
					
						2009-11-24 20:44:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						6a861cf92d
					 | 
					
						
						
							
							add script to fix the navigation links when the index order changes
						
						
						
						
						
						
						
						re-linking the pages manually makes one's head explode, so automate it. 
						
						
					 | 
					
						2009-11-24 20:44:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Oswald Buddenhagen
							
						 
					 | 
					
						
						
							
						
						7cb57a8a70
					 | 
					
						
						
							
							whitespace shuffling
						
						
						
						
						
						
						
						remove trailing ws, expand tabs and normalize newlines 
						
						
					 | 
					
						2009-11-24 20:44:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						c718095c28
					 | 
					
						
						
							
							Merge commit 'origin/1.3'
						
						
						
						
						
						
						
						Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
Reviewed-by: Oswald Buddenhagen 
						
						
					 | 
					
						2009-11-16 11:35:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Loehning
							
						 
					 | 
					
						
						
							
						
						de6551b8fe
					 | 
					
						
						
							
							S60: More precise about Qt version to use.
						
						
						
						
						
						
					 | 
					
						2009-11-13 11:31:15 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Loehning
							
						 
					 | 
					
						
						
							
						
						1e9152df6c
					 | 
					
						
						
							
							S60: Added documentation paragraph about running in emulator.
						
						
						
						
						
						
					 | 
					
						2009-11-13 11:31:14 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						5e6e5e3261
					 | 
					
						
						
							
							Screenshots for project settings.
						
						
						
						
						
						
						
						Reviewed-by: dt 
						
						
					 | 
					
						2009-11-12 20:36:21 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						0a69836488
					 | 
					
						
						
							
							Update the documentation for Qt for Symbian support.
						
						
						
						
						
						
						
						Reviewed-by: Robert Loehning 
						
						
					 | 
					
						2009-11-12 19:43:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						36d0d8500e
					 | 
					
						
						
							
							Merge commit 'origin/1.3'
						
						
						
						
						
						
					 | 
					
						2009-11-09 11:36:19 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								hjk
							
						 
					 | 
					
						
						
							
						
						72db7df3a2
					 | 
					
						
						
							
							fix some documentation glitches
						
						
						
						
						
						
					 | 
					
						2009-11-06 10:46:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						468b76fff2
					 | 
					
						
						
							
							Merge commit 'origin/1.3'
						
						
						
						
						
						
					 | 
					
						2009-11-05 19:00:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Molkentin
							
						 
					 | 
					
						
						
							
						
						c9f3b29807
					 | 
					
						
						
							
							Known issues: installer does not prepare qtcreator.ini for every user
						
						
						
						
						
						
						
						Reviewed-By: con 
						
						
					 | 
					
						2009-11-05 15:15:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						fa34847571
					 | 
					
						
						
							
							Merge commit 'origin/1.3'
						
						
						
						
						
						
						
						Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt4project.cpp 
						
						
					 | 
					
						2009-11-03 18:08:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dt
							
						 
					 | 
					
						
						
							
						
						c542714707
					 | 
					
						
						
							
							Also fix the cmake documentation.
						
						
						
						
						
						
					 | 
					
						2009-11-02 16:17:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								dt
							
						 
					 | 
					
						
						
							
						
						e5b4b65d56
					 | 
					
						
						
							
							Update docu of project pane. Missing the screenshots.
						
						
						
						
						
						
					 | 
					
						2009-11-02 15:42:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						3e81572b8a
					 | 
					
						
						
							
							Merge commit 'origin/1.3'
						
						
						
						
						
						
					 | 
					
						2009-10-30 17:22:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Friedemann Kleint
							
						 
					 | 
					
						
						
							
						
						4036d2e213
					 | 
					
						
						
							
							Documentation: Metnion proper Qt version to build.
						
						
						
						
						
						
						
						Reviewed-by: kh 
						
						
					 | 
					
						2009-10-30 14:01:45 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								con
							
						 
					 | 
					
						
						
							
						
						be3fafc311
					 | 
					
						
						
							
							Merge commit '2be0845c7492ad991f23ce5c90c322df788b62b5'
						
						
						
						
						
						
						
						Conflicts:
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qtversionmanager.cpp 
						
						
					 | 
					
						2009-10-29 18:54:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |