Christian Kamm 
							
						 
					 
					
						
						
							
						
						0194da7300 
					 
					
						
						
							
							Qml-C++: Find C++ qmlRegisterType calls and populate QML code model.  
						
						... 
						
						
						
						Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2011-01-04 15:58:22 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						b1bcf081d8 
					 
					
						
						
							
							Merge branch '2.1'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp 
						
						
					 
					
						2010-12-17 17:00:53 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						04e32b0049 
					 
					
						
						
							
							License headers.  
						
						
						
						
					 
					
						2010-12-17 16:03:42 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						63138eb808 
					 
					
						
						
							
							Added some initial support for function overloading.  
						
						
						
						
					 
					
						2010-12-10 10:32:46 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						72aa551a97 
					 
					
						
						
							
							C++: implemented switch decl to def for operators  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2313
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-11-19 11:50:28 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						05f2fd6669 
					 
					
						
						
							
							Renamed Symbol::scope() to Symbol::enclosingScope().  
						
						
						
						
					 
					
						2010-08-26 16:16:22 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						988cc958ab 
					 
					
						
						
							
							Renamed Symbol::identity() to Symbol::unqualifiedName().  
						
						
						
						
					 
					
						2010-08-26 12:23:09 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						e5ecb6b072 
					 
					
						
						
							
							Nicer implementation of Document::lastVisibleSymbolAt().  
						
						
						
						
					 
					
						2010-08-17 13:42:30 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						0540aa362d 
					 
					
						
						
							
							Get rid of the old Semantic pass.  
						
						
						
						
					 
					
						2010-08-13 16:55:43 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						6659e3ecba 
					 
					
						
						
							
							Use the new binder  
						
						
						
						
					 
					
						2010-08-13 16:55:43 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						41b4af0501 
					 
					
						
						
							
							Get rid of the prefix findOrInsert for the functions in CPlusPlus::Control.  
						
						
						
						
					 
					
						2010-08-11 15:25:19 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						354b9712e4 
					 
					
						
						
							
							Merged ScopedSymbol and Scope.  
						
						
						
						
					 
					
						2010-08-11 15:25:18 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						867bf3dae8 
					 
					
						
						
							
							Fixes for scope range calculation.  
						
						
						
						
					 
					
						2010-07-19 10:42:32 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						13ff3e2961 
					 
					
						
						
							
							Added comment.  
						
						
						
						
					 
					
						2010-07-16 16:04:58 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						fff4203a46 
					 
					
						
						
							
							Introduced helpers to rewrite types and names.  
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-07-16 11:04:52 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						45e12ccb42 
					 
					
						
						
							
							Fixed scope calculation in code completion.  
						
						
						
						
					 
					
						2010-07-06 09:19:20 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						76ebb46479 
					 
					
						
						
							
							Fixed: "Follow symbol" on constructor or destructor always jumps to class definition  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-1776 
						
						
					 
					
						2010-07-05 13:38:53 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						eb2ac188f2 
					 
					
						
						
							
							C++: Make 'follow symbol' for classes work in more cases.  
						
						... 
						
						
						
						Previously, it would still fail if a forward declaration and declaration
for a class were in the same file.
Task-number: QTCREATORBUG-20 
						
						
					 
					
						2010-06-18 09:28:32 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						e1a0f5abef 
					 
					
						
						
							
							C++: Make 'follow symbol' work with forward declared classes.  
						
						... 
						
						
						
						If it encounters a forward declaration, it tries to find the class
declaration globally now.
Task-number: QTCREATORBUG-20 
						
						
					 
					
						2010-06-16 15:37:39 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						09bf431ab5 
					 
					
						
						
							
							Fixed jump to the matching definition.  
						
						
						
						
					 
					
						2010-05-21 11:35:37 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						8ecbb44183 
					 
					
						
						
							
							Turn on C++0x support.  
						
						
						
						
					 
					
						2010-05-21 10:51:48 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						164aed22a5 
					 
					
						
						
							
							Fixed scope discovery.  
						
						
						
						
					 
					
						2010-05-20 16:07:33 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						18490596f9 
					 
					
						
						
							
							Renamed Document::findSymbolAt().  
						
						
						
						
					 
					
						2010-05-17 13:01:56 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						c739119c2a 
					 
					
						
						
							
							Fixed Document::scopeAt() to always return a valid scope.  
						
						
						
						
					 
					
						2010-05-14 13:55:21 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						60f76c96e8 
					 
					
						
						
							
							Improved LookupItem and get rid of some deprecated code.  
						
						
						
						
					 
					
						2010-05-14 13:55:21 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						c282da7d1e 
					 
					
						
						
							
							Introduced Snapshot::findMatchingDefinition().  
						
						
						
						
					 
					
						2010-05-11 14:15:07 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						7eae51507c 
					 
					
						
						
							
							Removed deprecated method Snapshot::globalNamespaceBinding().  
						
						
						
						
					 
					
						2010-05-11 14:15:06 +02:00 
						 
				 
			
				
					
						
							
							
								Thorbjørn Lindeijer 
							
						 
					 
					
						
						
							
						
						b9757a5eb3 
					 
					
						
						
							
							Disable C++0x support for now  
						
						... 
						
						
						
						It introduced at least one new crash to do with recovering from parsing
errors.
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-03-25 19:32:45 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						8329d7db94 
					 
					
						
						
							
							Recognize C++0x lambda expressions.  
						
						
						
						
					 
					
						2010-03-24 13:49:02 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						61a504c427 
					 
					
						
						
							
							Ensure that the memory pool can be reused after a rewind and get rid of the segmented array.  
						
						
						
						
					 
					
						2010-03-18 15:23:13 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						1cc5e1fe01 
					 
					
						
						
							
							Put the include depenency table into a separate class, and cache it when possible.  
						
						
						
						
					 
					
						2010-03-17 14:20:17 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						c3cc7cf4d8 
					 
					
						
						
							
							Enhance data stored for macros and macro uses.  
						
						... 
						
						
						
						In preparation for finding macro uses.
* Macro: add offset and length
* MacroUse: add line
* Document: add convenience functions for finding a macro definition, use
  or undefined use at a given location.
Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2009-12-21 14:57:05 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						51de95c497 
					 
					
						
						
							
							Use the text editor revision to ignore outdated parse results.  
						
						
						
						
					 
					
						2009-12-15 15:52:55 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						69c9a06342 
					 
					
						
						
							
							Removed the call to QDir::cleanPath.  
						
						
						
						
					 
					
						2009-12-07 11:20:16 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						60caec48d1 
					 
					
						
						
							
							Store the documents in an hash.  
						
						
						
						
					 
					
						2009-12-07 11:12:55 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						14376c3c32 
					 
					
						
						
							
							Initial work on the new CPlusPlus::Snapshot.  
						
						... 
						
						
						
						Encapsulate the details. 
						
						
					 
					
						2009-12-07 10:54:27 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						8741494f41 
					 
					
						
						
							
							Rename dependsOn() in filesDepedingOn() and introduced Snapshot::dependencyTable().  
						
						
						
						
					 
					
						2009-12-02 17:07:10 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						fade61a8a9 
					 
					
						
						
							
							Use const literals.  
						
						
						
						
					 
					
						2009-12-01 11:46:36 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						5d7def6d2a 
					 
					
						
						
							
							Refactored the AST visitors.  
						
						... 
						
						
						
						Now, the ASTVisitor constructor takes a valid reference to a TranslationUnit. 
						
						
					 
					
						2009-11-17 13:30:39 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						43bccb41ed 
					 
					
						
						
							
							Merge commit 'origin/1.3'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp 
						
						
					 
					
						2009-11-11 16:14:29 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						0ae2d96a9b 
					 
					
						
						
							
							Fixed the AST field names.  
						
						
						
						
					 
					
						2009-11-10 16:47:16 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						36a0ea2bcb 
					 
					
						
						
							
							Removed DeclarationListAST node.  
						
						... 
						
						
						
						Done with Erik Verbruggen 
						
						
					 
					
						2009-11-10 16:20:09 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						d2bd092b47 
					 
					
						
						
							
							Code model: Fix Windows issues (duplicate matches).  
						
						... 
						
						
						
						Ensure the code model receives file names with clean paths ('/')
and fix paths in the relevant places of the code model. Pass on clean
paths from Cpp reference find and display them correctly in the search
window tooltip.
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com > 
						
						
					 
					
						2009-11-09 13:53:28 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						eaa2c10a25 
					 
					
						
						
							
							Introduced CppTools::CppModelManagerInterface::updateModifiedFiles().  
						
						... 
						
						
						
						updateModifiedFiles ckecks the timestamp and reparses all the modified files in the current snapshot. 
						
						
					 
					
						2009-11-05 12:34:02 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						f829ef899c 
					 
					
						
						
							
							Store in the document's macroUsages only the top-level macro expansions.  
						
						
						
						
					 
					
						2009-10-15 16:25:10 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						8356d3360b 
					 
					
						
						
							
							Delay the parsing of the document.  
						
						
						
						
					 
					
						2009-09-30 16:13:43 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						22ed0255b9 
					 
					
						
						
							
							Track more macro uses.  
						
						... 
						
						
						
						In particular macros that are only checked for definition or are
expanded during the evaluation of an #if or #elif directive are now also
added to the list available through Document::macroUses().
The names of undefined macros that are interesting (because they're used
in an #ifdef or a defined(...)) are now available through
Document::undefinedMacroUses().
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com > 
						
						
					 
					
						2009-09-25 16:08:01 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						93cbef8724 
					 
					
						
						
							
							long live the king  
						
						
						
						
					 
					
						2009-08-14 09:30:56 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						1e7b406327 
					 
					
						
						
							
							Added Snapshot::dependsOn().  
						
						... 
						
						
						
						Snapshot::dependsOn(fn) returns the files in the snapshot that depends on fn. 
						
						
					 
					
						2009-07-29 10:18:07 +02:00