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 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						162b0dae81 
					 
					
						
						
							
							Version bump.  
						
						
						
						
					 
					
						2009-10-29 17:17:49 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						008168838f 
					 
					
						
						
							
							Version bump.  
						
						
						
						
					 
					
						2009-10-29 17:15:55 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						2e28201373 
					 
					
						
						
							
							Refer to new bug tracker.  
						
						
						
						
					 
					
						2009-10-28 14:36:51 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						7ecbfbe6d2 
					 
					
						
						
							
							Merge commit 'origin/1.3'  
						
						
						
						
					 
					
						2009-10-09 20:15:17 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						daa6e54ae7 
					 
					
						
						
							
							Start on documentation for Qt for Symbian development in Qt Creator  
						
						
						
						
					 
					
						2009-10-09 20:11:56 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						7f345078c9 
					 
					
						
						
							
							Update known issues  
						
						
						
						
					 
					
						2009-10-09 17:45:40 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						842ebf50e1 
					 
					
						
						
							
							Merge commit 'origin/1.3'  
						
						
						
						
					 
					
						2009-10-07 19:25:02 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						dbc042ff04 
					 
					
						
						
							
							First set of documentation updates for Qt Creator 1.3.  
						
						... 
						
						
						
						- Detail on setting up Qt Versions
- Mention CVS support
- More shortcuts
- Mention Shortcut differences on OS X 
						
						
					 
					
						2009-10-07 18:25:45 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						ead9c19c40 
					 
					
						
						
							
							Merge commit 'origin/1.3'  
						
						
						
						
					 
					
						2009-10-06 18:42:28 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						c70f968fac 
					 
					
						
						
							
							CDB: Fix step into, improve multithread dumping, exception logging  
						
						... 
						
						
						
						Use new call syntax of 6.11. for dumper call loading. Execute
Dumpers in a single thread (current) if at all possible (not
in some WaitFor or artificial break thread). Show one more
frame in threads view if it is FastCallReturn. Fix step into
(ignore one event), log some more exceptions. Generally log
exceptions to the debugger windows to be able to see stuff
like DLL missing, etc. 
						
						
					 
					
						2009-10-06 15:50:48 +02: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 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						9bdd359827 
					 
					
						
						
							
							Some small updates to the documentation of generic projects  
						
						
						
						
					 
					
						2009-09-01 14:50:27 +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 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						475a141356 
					 
					
						
						
							
							long live the king  
						
						
						
						
					 
					
						2009-08-14 09:37:15 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						6978d804db 
					 
					
						
						
							
							Doc - Fixed a typo  
						
						... 
						
						
						
						Reviewed-By: TrustMe 
						
						
					 
					
						2009-08-05 16:25:08 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						2356bdc7ad 
					 
					
						
						
							
							Doc - More documentation for the Sessions section  
						
						... 
						
						
						
						Reviewed-By: TrustMe 
						
						
					 
					
						2009-08-04 12:56:17 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						86798b4d0d 
					 
					
						
						
							
							Doc - More Cleanups  
						
						... 
						
						
						
						Reviewed-By: TrustMe 
						
						
					 
					
						2009-08-03 15:58:12 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						c79e8079dd 
					 
					
						
						
							
							Doc - Fixed a typo  
						
						... 
						
						
						
						Reviewed-By: TrustMe 
						
						
					 
					
						2009-08-03 15:50:27 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						88549a4b1d 
					 
					
						
						
							
							Doc - Some cleanups on the Generic Project documentation  
						
						... 
						
						
						
						Reviewed-By: TrustMe 
						
						
					 
					
						2009-08-03 14:58:06 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						a46b969194 
					 
					
						
						
							
							Doc - Modifying the documentation of Creator to have a separate page on  
						
						... 
						
						
						
						Session Management
Reviewed-By: TrustMe
Still work in progress, though. 
						
						
					 
					
						2009-07-27 15:06:51 +02:00 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						cc95132add 
					 
					
						
						
							
							Made a start on improving the generic project documentation  
						
						
						
						
					 
					
						2009-07-24 16:38:28 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						d7dbb27f0d 
					 
					
						
						
							
							Merge commit 'origin/1.2'  
						
						
						
						
					 
					
						2009-06-19 10:19:05 +02:00 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						c3bc32620f 
					 
					
						
						
							
							Document known issue with storing the settings on an NFS share  
						
						
						
						
					 
					
						2009-06-17 16:02:34 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						2919c21007 
					 
					
						
						
							
							Cherry-pick: Update license headers and sales contact details.  
						
						... 
						
						
						
						Reviewed-by: Trust Me
Conflicts:
	src/libs/cplusplus/CppBindings.cpp
	src/libs/cplusplus/CppBindings.h
	src/libs/cplusplus/FastPreprocessor.cpp
	src/libs/cplusplus/FastPreprocessor.h
	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
	src/plugins/cpptools/cppcurrentdocumentfilter.h
	src/plugins/cpptools/cppsemanticsearch.cpp
	src/plugins/cpptools/cppsemanticsearch.h
	src/plugins/duieditor/parser/qmljs.g
	src/plugins/duieditor/parser/qmljsast.cpp
	src/plugins/duieditor/parser/qmljsast_p.h
	src/plugins/duieditor/parser/qmljsastfwd_p.h
	src/plugins/duieditor/parser/qmljsastvisitor.cpp
	src/plugins/duieditor/parser/qmljsastvisitor_p.h
	src/plugins/duieditor/parser/qmljsengine_p.cpp
	src/plugins/duieditor/parser/qmljsengine_p.h
	src/plugins/duieditor/parser/qmljsgrammar.cpp
	src/plugins/duieditor/parser/qmljsgrammar_p.h
	src/plugins/duieditor/parser/qmljslexer.cpp
	src/plugins/duieditor/parser/qmljslexer_p.h
	src/plugins/duieditor/parser/qmljsmemorypool_p.h
	src/plugins/duieditor/parser/qmljsnodepool_p.h
	src/plugins/duieditor/parser/qmljsparser.cpp
	src/plugins/duieditor/parser/qmljsparser_p.h
	src/plugins/duieditor/parser/qmljsprettypretty.cpp
	src/plugins/duieditor/parser/qmljsprettypretty_p.h
	src/plugins/duieditor/rewriter/rewriter.cpp
	src/plugins/duieditor/rewriter/rewriter_p.h
	src/plugins/duieditor/rewriter/textwriter.cpp
	src/plugins/duieditor/rewriter/textwriter_p.h
	src/shared/cplusplus/ASTClone.cpp
	tests/manual/cplusplus/main.cpp 
						
						
					 
					
						2009-06-16 17:26:44 +02:00 
						 
				 
			
				
					
						
							
							
								Jason McDonald 
							
						 
					 
					
						
						
							
						
						884b7af769 
					 
					
						
						
							
							Update license headers and sales contact details.  
						
						... 
						
						
						
						Reviewed-by: Trust Me 
						
						
					 
					
						2009-06-17 00:01:27 +10:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						9c7801956d 
					 
					
						
						
							
							Merge commit 'origin/1.2'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/debugger/breakwindow.cpp 
						
						
					 
					
						2009-06-12 17:03:17 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						ad93155a9e 
					 
					
						
						
							
							Update some URLs.  
						
						... 
						
						
						
						Reviewed-by: TrustMe 
						
						
					 
					
						2009-06-12 15:11:40 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						d08b90b494 
					 
					
						
						
							
							Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline  
						
						
						
						
					 
					
						2009-06-11 11:32:47 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f4fa0fd770 
					 
					
						
						
							
							System Qt is now called Auto-deteced Qt.  
						
						... 
						
						
						
						Reviewed-By: TrustMe 
						
						
					 
					
						2009-06-10 17:39:58 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						f3875c7e8e 
					 
					
						
						
							
							Merge commit 'origin/1.2'  
						
						
						
						
					 
					
						2009-06-08 15:50:43 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						5309ba476c 
					 
					
						
						
							
							Document minimal supported perforce version.  
						
						
						
						
					 
					
						2009-06-08 12:54:25 +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 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						e7fece34c7 
					 
					
						
						
							
							Fixed broken doc link.  
						
						
						
						
					 
					
						2009-05-28 15:50:44 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						2ddc2cc44d 
					 
					
						
						
							
							Added correct trademarks to docs.  
						
						
						
						
					 
					
						2009-05-28 15:48:16 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						12a66bfa1f 
					 
					
						
						
							
							Updated documentation for 1.2  
						
						... 
						
						
						
						Reviewed-by: Kavindra Palaraja <qtc-committer@nokia.com > 
						
						
					 
					
						2009-05-28 15:31:12 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						a7ddee07ed 
					 
					
						
						
							
							Fixes:    Doc - some fixes, more pending.  
						
						
						
						
					 
					
						2009-05-13 18:01:13 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						63f760a8d6 
					 
					
						
						
							
							Unify Gdb and Gdb spelling, rename Gdb View to "Debugger", update docs.  
						
						
						
						
					 
					
						2009-05-06 17:54:11 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						62e370ae4c 
					 
					
						
						
							
							Fixes:    Doc - added page navigation shortcut to the Keyboard  
						
						... 
						
						
						
						Shortcuts page.
Task:     251975 
						
						
					 
					
						2009-05-06 17:10:54 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f7ec42a208 
					 
					
						
						
							
							Documentation: Explain external library handling.  
						
						
						
						
					 
					
						2009-05-06 16:22:42 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						de4dda3d72 
					 
					
						
						
							
							Fixes:    Doc - minor cleanups  
						
						... 
						
						
						
						RevBy:    dt <qtc-committer@nokia.com > 
						
						
					 
					
						2009-05-04 14:21:56 +02:00 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						4e1025fb1f 
					 
					
						
						
							
							Added documentation about the different types of completion items  
						
						... 
						
						
						
						Requested on Qt Creator mailing list.
Reviewed-by: Kavindra 
						
						
					 
					
						2009-04-27 15:14:06 +02:00 
						 
				 
			
				
					
						
							
							
								Simon Hausmann 
							
						 
					 
					
						
						
							
						
						035e1eb4fe 
					 
					
						
						
							
							Merge branch '1.1'  
						
						
						
						
					 
					
						2009-04-18 01:04:01 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						e915b972da 
					 
					
						
						
							
							Update known issues.  
						
						
						
						
					 
					
						2009-04-17 16:16:01 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						124fa21854 
					 
					
						
						
							
							Screenshots for cmake support documentation.  
						
						... 
						
						
						
						Reviewed-by: dt <qtc-committer@nokia.com > 
						
						
					 
					
						2009-04-17 16:10:34 +02:00 
						 
				 
			
				
					
						
							
							
								Kavindra Devi Palaraja 
							
						 
					 
					
						
						
							
						
						b2e74afe1d 
					 
					
						
						
							
							Fixes:    - Doc - minor fixes  
						
						
						
						
					 
					
						2009-04-17 15:35:47 +02:00