con 
							
						 
					 
					
						
						
							
						
						23c22b7c66 
					 
					
						
						
							
							License headers, part 2  
						
						 
						
						
						
						
					 
					
						2010-12-17 17:14:20 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						16dc934a48 
					 
					
						
						
							
							Fixes autotests for windows.  
						
						 
						
						
						
						
					 
					
						2010-12-14 11:01:17 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						6b7535d8b3 
					 
					
						
						
							
							tests: fixes  
						
						 
						
						
						
						
					 
					
						2010-12-03 15:04:19 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						c5c4bacda9 
					 
					
						
						
							
							C++ indenter: Fix labels.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-12-01 10:22:41 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						2960c735df 
					 
					
						
						
							
							Debugger/CPP: Move helpers to simplify types to CPlusPlus-lib.  
						
						 
						
						... 
						
						
						
						Make available for log simplification, etc.
Add autotest, fix broken std::set and MSVC.
Rubber-stamped-by: Christian Kamm <christian.d.kamm@nokia.com > 
						
						
					 
					
						2010-11-25 13:51:54 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						7a616d5896 
					 
					
						
						
							
							C++ indenter: Align to next token instead of end of current.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-3136
Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-11-22 10:09:39 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						d2468a4491 
					 
					
						
						
							
							C++ indenter: Fix for GNU and Whitesmiths style switch statement.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2994 
						
						
					 
					
						2010-11-04 14:09:47 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						beaff08200 
					 
					
						
						
							
							Fix test compilation on Mac by using rpath.  
						
						 
						
						
						
						
					 
					
						2010-11-01 15:10:44 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								con 
							
						 
					 
					
						
						
							
						
						59c301a8c8 
					 
					
						
						
							
							Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.  
						
						 
						
						... 
						
						
						
						qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues. 
						
						
					 
					
						2010-11-01 14:55:37 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						f928757517 
					 
					
						
						
							
							tests: Allow tests to use creator libs/plugins directly (linux/mac)  
						
						 
						
						
						
						
					 
					
						2010-11-01 11:40:20 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						35bb61590d 
					 
					
						
						
							
							Merge remote branch 'origin/2.1'  
						
						 
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro 
						
						
					 
					
						2010-10-25 11:27:30 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						2ede8e3c16 
					 
					
						
						
							
							tests: get tst_codegen running again, if not passing yet.  
						
						 
						
						
						
						
					 
					
						2010-10-21 14:52:56 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						524a9ac4a8 
					 
					
						
						
							
							tests: more test project cleanup  
						
						 
						
						
						
						
					 
					
						2010-10-21 14:49:58 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						e7a6bae170 
					 
					
						
						
							
							C++ indenter: Add autotest for C++0x 'for' statement.  
						
						 
						
						... 
						
						
						
						Reviewed-by: trustme 
						
						
					 
					
						2010-10-20 10:51:13 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						d95f3324c7 
					 
					
						
						
							
							tests: remove unnecessary TARGET = tst_$$TARGET  
						
						 
						
						... 
						
						
						
						"CONFIG += testcase" does this for us, and is the proper way to do this. 
						
						
					 
					
						2010-10-20 15:03:01 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						54c8a2e5b5 
					 
					
						
						
							
							Tests: Get autotests compiling again.  
						
						 
						
						
						
						
					 
					
						2010-10-20 14:16:04 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						5ac981a0ac 
					 
					
						
						
							
							C++ indenter: Fix indentation after namespace aliases.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2574
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-10-19 12:49:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						b78c1ef6da 
					 
					
						
						
							
							Merge remote branch 'origin/2.1'  
						
						 
						
						... 
						
						
						
						Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp 
						
						
					 
					
						2010-10-11 14:16:33 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						7334ed9ec4 
					 
					
						
						
							
							C++: fixed translatable quick-fix strings.  
						
						 
						
						
						
						
					 
					
						2010-10-08 13:15:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						192ca70649 
					 
					
						
						
							
							C++ Parser: fix infinite loop when recovering from incorrect @selector expression.  
						
						 
						
						
						
						
					 
					
						2010-10-08 13:15:21 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						7e3294a8ce 
					 
					
						
						
							
							C++ indenter: Don't get confused on 'for (a in b)'.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen
(cherry picked from commit c2d890f65e ) 
						
						
					 
					
						2010-10-08 13:09:26 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						ed6585c312 
					 
					
						
						
							
							C++ indenter: Add another ObjC test.  
						
						 
						
						
						
						
					 
					
						2010-10-06 15:39:53 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						c2d890f65e 
					 
					
						
						
							
							C++ indenter: Don't get confused on 'for (a in b)'.  
						
						 
						
						... 
						
						
						
						Reviewed-by: Roberto Raggi
Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-10-06 15:35:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						bbe790debe 
					 
					
						
						
							
							tests: make compile again  
						
						 
						
						
						
						
					 
					
						2010-10-01 11:32:36 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						f39494e4c2 
					 
					
						
						
							
							C++: make InsertionPointLocator ready for re-use.  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 519f1d11947ff3109850e559fae868c4a55deb43) 
						
						
					 
					
						2010-09-27 19:07:15 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						17e0886c69 
					 
					
						
						
							
							C++ indenter: Fix error recovery in function definitions.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-1517 
						
						
					 
					
						2010-09-24 15:58:23 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						d7bf4f515d 
					 
					
						
						
							
							C++ indenter: Fix indentation if template and class appear on one line.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2427 
						
						
					 
					
						2010-09-24 15:08:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						be563abf68 
					 
					
						
						
							
							C++ indenter: Simplify debugging by making dump() more verbose.  
						
						 
						
						
						
						
					 
					
						2010-09-24 15:08:54 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						3edb0a8480 
					 
					
						
						
							
							C++: Added unittest for  5a1924f1a0.  
						
						 
						
						
						
						
					 
					
						2010-09-16 11:31:07 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						e4de305b02 
					 
					
						
						
							
							C++: Fixed regression in autotests.  
						
						 
						
						
						
						
					 
					
						2010-09-15 11:17:05 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						e5cbb56fe7 
					 
					
						
						
							
							C++ indenter: Fix for statement indentation and add test.  
						
						 
						
						
						
						
					 
					
						2010-09-15 11:16:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						642b6fb0d3 
					 
					
						
						
							
							C++ indenter: Separate indent into logical indent and padding.  
						
						 
						
						
						
						
					 
					
						2010-09-13 12:38:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						eb498ee428 
					 
					
						
						
							
							Tests: some cleanup of pro files, marking of tested components.  
						
						 
						
						
						
						
					 
					
						2010-09-06 14:19:32 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						c12866a467 
					 
					
						
						
							
							Merge CPlusPlus::NameId and CPlusPlus::Identifier.  
						
						 
						
						
						
						
					 
					
						2010-09-02 12:51:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						1f0b600b82 
					 
					
						
						
							
							Autotests: More cleanup of tests, and initial marking of components belonged to.  
						
						 
						
						
						
						
					 
					
						2010-09-02 15:32:04 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						1862282bee 
					 
					
						
						
							
							C++ indenter: Fix nested array/struct initializers.  
						
						 
						
						
						
						
					 
					
						2010-08-31 09:45:01 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						05f2fd6669 
					 
					
						
						
							
							Renamed Symbol::scope() to Symbol::enclosingScope().  
						
						 
						
						
						
						
					 
					
						2010-08-26 16:16:22 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						688d382ad9 
					 
					
						
						
							
							Some cleanup in the C++ AST.  
						
						 
						
						
						
						
					 
					
						2010-08-26 16:07:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						b79fe7e711 
					 
					
						
						
							
							C++: Fix indenting of QML_* macros.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2111 
						
						
					 
					
						2010-08-25 14:55:16 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bill King 
							
						 
					 
					
						
						
							
						
						5b2fb4bb67 
					 
					
						
						
							
							Fixes: get tests compiling again that depend on the cpp library  
						
						 
						
						... 
						
						
						
						Details:  This gets the tests running again, by statically linking
them. qmake doesn't have support for depending upon other projects
being built, so when the projects are built out of order, libCPlusPlusTest.so
wasn't being built before trying to be linked against. 
						
						
					 
					
						2010-08-19 11:56:53 +10:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						d21de8c621 
					 
					
						
						
							
							Fixed the objc auto tests  
						
						 
						
						
						
						
					 
					
						2010-08-13 16:55:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						ae5db839e1 
					 
					
						
						
							
							Compile  
						
						 
						
						
						
						
					 
					
						2010-08-13 16:55:43 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						13ebe7e46c 
					 
					
						
						
							
							Compile.  
						
						 
						
						
						
						
					 
					
						2010-08-11 16:06:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						2ebaf3fe5b 
					 
					
						
						
							
							Get rid of the #warning directives.  
						
						 
						
						
						
						
					 
					
						2010-08-11 15:48:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						667e8aa01f 
					 
					
						
						
							
							Compile.  
						
						 
						
						
						
						
					 
					
						2010-08-05 17:53:14 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						6324bf4460 
					 
					
						
						
							
							Introduced IdExpressionAST.  
						
						 
						
						
						
						
					 
					
						2010-08-02 12:52:12 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						6bbc732a29 
					 
					
						
						
							
							Sprinkled a bit of doxymentation over various classes.  
						
						 
						
						
						
						
					 
					
						2010-07-28 17:34:00 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						27026af2e3 
					 
					
						
						
							
							C++ indenter: Fix indent of block statements in substatement blocks.  
						
						 
						
						... 
						
						
						
						Task-number: QTCREATORBUG-1919 
						
						
					 
					
						2010-07-28 12:39:27 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						a8179152c9 
					 
					
						
						
							
							Added tests for the InsertionPointLocator and fixed bugs.  
						
						 
						
						
						
						
					 
					
						2010-07-28 12:10:11 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						fff4203a46 
					 
					
						
						
							
							Introduced helpers to rewrite types and names.  
						
						 
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-07-16 11:04:52 +02:00