con 
							
						 
					 
					
						
						
							
						
						d1023c7614 
					 
					
						
						
							
							It's 2011 now.  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2011-01-12 09:46:24 +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 
							
						 
					 
					
						
						
							
						
						f7f3539786 
					 
					
						
						
							
							Skip using namespace directives when searching for declarations.  
						
						
						
						
					 
					
						2010-12-03 11:26:31 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						189311816c 
					 
					
						
						
							
							Resolve local using namespace directives.  
						
						... 
						
						
						
						Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-10-05 14:22:05 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						c12866a467 
					 
					
						
						
							
							Merge CPlusPlus::NameId and CPlusPlus::Identifier.  
						
						
						
						
					 
					
						2010-09-02 12:51:01 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						05f2fd6669 
					 
					
						
						
							
							Renamed Symbol::scope() to Symbol::enclosingScope().  
						
						
						
						
					 
					
						2010-08-26 16:16:22 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						b2baaee4b6 
					 
					
						
						
							
							Search for symbols in the template prototype.  
						
						
						
						
					 
					
						2010-08-12 12:34:23 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						2ebaf3fe5b 
					 
					
						
						
							
							Get rid of the #warning directives.  
						
						
						
						
					 
					
						2010-08-11 15:48:40 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						a14016bfe6 
					 
					
						
						
							
							Process the template symbol.  
						
						
						
						
					 
					
						2010-08-11 15:25:19 +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 
							
						 
					 
					
						
						
							
						
						6618a3cd67 
					 
					
						
						
							
							Removed TemplateParameters.  
						
						
						
						
					 
					
						2010-08-11 15:25:19 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						354b9712e4 
					 
					
						
						
							
							Merged ScopedSymbol and Scope.  
						
						
						
						
					 
					
						2010-08-11 15:25:18 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						4ff3ee2ff0 
					 
					
						
						
							
							Use Prototype instead of Function.  
						
						
						
						
					 
					
						2010-08-05 17:53:14 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						9aa991d636 
					 
					
						
						
							
							Refactored CPlusPlus::Function.  
						
						
						
						
					 
					
						2010-08-05 17:53:14 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						6905b6a5af 
					 
					
						
						
							
							Get rid of the member ClassOrNamespace::_instantiations.  
						
						
						
						
					 
					
						2010-08-04 13:07:59 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						3bc473c0c2 
					 
					
						
						
							
							Temporary fix to get at least some name back.  
						
						
						
						
					 
					
						2010-07-27 15:58:27 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						50875ff0da 
					 
					
						
						
							
							Fixed LookupContext::fullyQualifiedName()  
						
						... 
						
						
						
						Now the method can be used to get the fully qualified name of
destructors, operator-ids and conversion-function-ids. 
						
						
					 
					
						2010-07-21 12:50:24 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						5e68a31d0b 
					 
					
						
						
							
							Fixed fully-qualified-name for destructors.  
						
						
						
						
					 
					
						2010-07-21 10:40:18 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						c4ede7263d 
					 
					
						
						
							
							Get rid of the those ugly warnings.  
						
						
						
						
					 
					
						2010-07-19 15:10:06 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						f7a8c5f05d 
					 
					
						
						
							
							Fixed lookup to skip over friend declarations.  
						
						
						
						
					 
					
						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 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						06c7cb9b88 
					 
					
						
						
							
							Disable Create declaration from definition quickfix.  
						
						
						
						
					 
					
						2010-07-12 15:10:00 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						adfdb51660 
					 
					
						
						
							
							Recursive definition of CPlusPlus::QualifiedNameId.  
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-07-12 15:10:00 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						9135c8ccb1 
					 
					
						
						
							
							Quickfix for adding a declaration to a class from a definition.  
						
						
						
						
					 
					
						2010-07-12 09:53:58 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						5751f4f1c5 
					 
					
						
						
							
							Reenabled the old `deprecated' template instantiation.  
						
						... 
						
						
						
						I hate this commit, but unfortunately, I don't have time right now
to finish the new template instantion algorithm so I have to
enable the old way of doing instantiations. 
						
						
					 
					
						2010-07-09 10:17:28 +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 
							
						 
					 
					
						
						
							
						
						cceaffca5b 
					 
					
						
						
							
							Keep the Control around for as long needed.  
						
						
						
						
					 
					
						2010-06-04 17:58:29 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						ed501b9bc3 
					 
					
						
						
							
							Look at the injected class name.  
						
						
						
						
					 
					
						2010-06-01 14:00:02 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						0dfe7b9b95 
					 
					
						
						
							
							Fixed unqualified name lookup.  
						
						
						
						
					 
					
						2010-06-01 12:22:07 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						ecb951cab0 
					 
					
						
						
							
							Compile.  
						
						
						
						
					 
					
						2010-05-31 16:01:27 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						cca38a737e 
					 
					
						
						
							
							Disable the cacheing of template instantiations.  
						
						
						
						
					 
					
						2010-05-31 12:37:16 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						e343b33342 
					 
					
						
						
							
							Check for possible 0x0 accesses.  
						
						
						
						
					 
					
						2010-05-28 11:15:08 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						64e9f652e0 
					 
					
						
						
							
							Handle using declarations  
						
						
						
						
					 
					
						2010-05-27 16:33:18 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						d2a62b07f0 
					 
					
						
						
							
							Create bindings for anonymous typedefs.  
						
						
						
						
					 
					
						2010-05-26 10:10:23 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						f335855ade 
					 
					
						
						
							
							Warn about unexpected using declarations.  
						
						
						
						
					 
					
						2010-05-25 17:15:23 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						405353ab23 
					 
					
						
						
							
							Removed the CppBindings.  
						
						
						
						
					 
					
						2010-05-25 17:15:23 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						744d294f3b 
					 
					
						
						
							
							Improved lookup of qualified names.  
						
						
						
						
					 
					
						2010-05-25 17:15:21 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						3b113a2d74 
					 
					
						
						
							
							Deprecate the old template instantiation.  
						
						
						
						
					 
					
						2010-05-20 15:22:09 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						8d5dde66c0 
					 
					
						
						
							
							Fixed qualified name creation for ObjC classes and protocols.  
						
						... 
						
						
						
						Also fixed the tests for it. 
						
						
					 
					
						2010-05-20 12:13:44 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						1e1d8e450f 
					 
					
						
						
							
							Use the Control created by CPlusPlus::CreateBindings.  
						
						
						
						
					 
					
						2010-05-18 09:24:14 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						5cb42c93ef 
					 
					
						
						
							
							Instantiate the template functions.  
						
						
						
						
					 
					
						2010-05-18 09:24:04 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						e2297e4cbd 
					 
					
						
						
							
							less verbose.  
						
						
						
						
					 
					
						2010-05-14 15:34:39 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						25b04ff5b4 
					 
					
						
						
							
							Flush the current binding before searching for types.  
						
						
						
						
					 
					
						2010-05-14 15:32:40 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						81d7ac2d69 
					 
					
						
						
							
							Improved LookupContext::fullyQualifiedName().  
						
						
						
						
					 
					
						2010-05-14 15:10:28 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						ca1d1259c6 
					 
					
						
						
							
							Cleanup.  
						
						
						
						
					 
					
						2010-05-14 14:37:17 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						469b6ef741 
					 
					
						
						
							
							Get rid of useless overload of findType().  
						
						
						
						
					 
					
						2010-05-14 14:18:44 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						31135d5767 
					 
					
						
						
							
							More renaming.  
						
						
						
						
					 
					
						2010-05-14 14:00:56 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						13625c2121 
					 
					
						
						
							
							Removed ClassOrNamespace::findType_helper() & co.  
						
						
						
						
					 
					
						2010-05-14 13:55:25 +02:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						8eac2fcd21 
					 
					
						
						
							
							More renaming.  
						
						
						
						
					 
					
						2010-05-14 13:55:25 +02:00