con 
							
						 
					 
					
						
						
							
						
						b0040dc858 
					 
					
						
						
							
							Merge remote branch 'origin/2.0'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp 
						
						
					 
					
						2010-06-10 15:00:16 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						45415783e7 
					 
					
						
						
							
							QmlJS: Get rid of xml file describing qml builtin types.  
						
						... 
						
						
						
						The type information is now generated at runtime. 
						
						
					 
					
						2010-06-10 11:33:04 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						e307bc2506 
					 
					
						
						
							
							QmlJS: Store plugin metatypes in LibraryInfo. Rework type loading.  
						
						
						
						
					 
					
						2010-06-09 14:36:54 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						fa79add293 
					 
					
						
						
							
							QmlJS: Check for existance of qmldump binary before using it.  
						
						
						
						
					 
					
						2010-06-09 14:36:54 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						f9d7872761 
					 
					
						
						
							
							QmlJS: Use ComponentVersion everywhere.  
						
						
						
						
					 
					
						2010-06-09 14:36:53 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						822520c304 
					 
					
						
						
							
							QmlJS: Get at types defined in plugins by running qmldump on them.  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-1021
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-06-09 14:36:53 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						313d30654e 
					 
					
						
						
							
							QmlJS: Avoid infinite recursion when encountering property loops.  
						
						... 
						
						
						
						Such as
property int foo: bar
property int bar: foo.
Task-number: QTCREATORBUG-1389
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-06-08 15:37:16 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						3b8b6e89cc 
					 
					
						
						
							
							QmlJS: Autocomplete dot and colon for properties.  
						
						... 
						
						
						
						Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-06-07 17:37:45 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						112df597db 
					 
					
						
						
							
							Fixed default property discovery for custom QML components.  
						
						... 
						
						
						
						Reviewed-by: Christian Kamm 
						
						
					 
					
						2010-05-31 12:21:12 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						62141475e3 
					 
					
						
						
							
							QmlJS: Potentially fix hard-to-reproduce crash in JS completion.  
						
						... 
						
						
						
						* Context::build was potentially dangerous. Link and ScopeBuilder
  went out of scope before their results stopped being used.
* ScopeBuilder: If no function scope object was found, don't add it.
Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-05-19 14:23:08 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						fadfe9c64e 
					 
					
						
						
							
							QmlJS: Generalize EasingCurve name check to all enums.  
						
						... 
						
						
						
						Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-05-19 12:24:32 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						0e12240613 
					 
					
						
						
							
							QmlJS: Completion for enums.  
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-04-29 16:05:25 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						f48df24737 
					 
					
						
						
							
							QmlJS: Improve property and Type completion in Qml object members.  
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-04-29 16:05:24 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						9af4f2c64f 
					 
					
						
						
							
							QmlJS: Remove unused function environment from binder.  
						
						... 
						
						
						
						This used to contain all functions declared in Script blocks. With them
gone, there's no reason to keep it. 
						
						
					 
					
						2010-04-28 10:01:36 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						db2f91ef8f 
					 
					
						
						
							
							QmlJS: Don't produce Qml type errors if plugins are imported.  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-1021
Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-04-07 11:09:27 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						4ba9a1b0c2 
					 
					
						
						
							
							Fixed qualified-enum handling.  
						
						... 
						
						
						
						Done-with: ckamm 
						
						
					 
					
						2010-04-06 15:41:06 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						e615cf82a5 
					 
					
						
						
							
							Fixed regression when assigning an object binding to an array property.  
						
						
						
						
					 
					
						2010-04-06 12:57:02 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						491bf79d5f 
					 
					
						
						
							
							Changed QML reading in QML designer to use the interpreter for property types.  
						
						
						
						
					 
					
						2010-04-06 11:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						b71d3eb145 
					 
					
						
						
							
							Added defaultProperty attribute reading and storing.  
						
						
						
						
					 
					
						2010-04-06 09:38:40 +02:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						68a463cf36 
					 
					
						
						
							
							Switched QML designer to use the ast for loading.  
						
						
						
						
					 
					
						2010-03-18 12:50:29 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						9ea01cf5fb 
					 
					
						
						
							
							Improve Qml code model import handling.  
						
						... 
						
						
						
						* Fill the snapshot with files that could be imported.
* Implement package imports.
* The qmldir file is not parsed yet.
Reviewed-by: Erik Verbruggen 
						
						
					 
					
						2010-03-18 11:25:37 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9595504bda 
					 
					
						
						
							
							Long live the king!  
						
						
						
						
					 
					
						2010-03-05 11:28:13 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						13d7612f09 
					 
					
						
						
							
							Removed private header dependencies and introduced loading QML types from XML file.  
						
						
						
						
					 
					
						2010-03-01 13:13:02 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						f0674aa7e9 
					 
					
						
						
							
							Add check for anchor line, changed value assignment checks into visitor.  
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-02-23 17:03:05 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						0e2685332c 
					 
					
						
						
							
							Add check for correct color string in Qml.  
						
						
						
						
					 
					
						2010-02-23 14:57:19 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						fcb6c4984e 
					 
					
						
						
							
							Fix a memory leak with the QmlJS scope chain.  
						
						
						
						
					 
					
						2010-02-22 11:21:25 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						8d14f18ec0 
					 
					
						
						
							
							Add an accessor to get the flat scope list from ScopeChain.  
						
						... 
						
						
						
						Done-with: Erik Verbruggen 
						
						
					 
					
						2010-02-22 10:22:23 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						08cfc8f28c 
					 
					
						
						
							
							Pass in the whole AST path for scope creation.  
						
						... 
						
						
						
						Just the declaring member isn't enough. 
						
						
					 
					
						2010-02-22 10:22:23 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						c289897351 
					 
					
						
						
							
							Make QmlJS scope building more flexible.  
						
						... 
						
						
						
						Instead of only maintaining a flat list of scopes, actually store the
global, component chain, root object, scope object, function, id and js
scopes separately. 
						
						
					 
					
						2010-02-22 10:22:23 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						78b3145477 
					 
					
						
						
							
							Semantic checking for easing curve names.  
						
						... 
						
						
						
						Done-with: Christian Kamm 
						
						
					 
					
						2010-02-19 15:11:03 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						265118eb5e 
					 
					
						
						
							
							Add the onNameChanged signals that Qml properties generate implicitly.  
						
						
						
						
					 
					
						2010-02-17 09:17:29 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						669b9c4552 
					 
					
						
						
							
							Add signals defined in Qml and their generated slots to the code model.  
						
						
						
						
					 
					
						2010-02-17 08:45:39 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						da3679066e 
					 
					
						
						
							
							Add QmlJS semantic checker.  
						
						... 
						
						
						
						* Add SemanticHighlighter to QmlJSTextEditor to update the semantic info
  in a background thread.
* Add QmlJS::Check to run semantic checks on qml and js documents.
* Add a check for incorrect property names.
* Fix hoverhandler to show tool tips from extra selections over help
  tooltips. 
						
						
					 
					
						2010-02-16 10:38:56 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						220f6b43c2 
					 
					
						
						
							
							Register the Qt' and the console' object.  
						
						
						
						
					 
					
						2010-02-10 15:51:53 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						967ed09c29 
					 
					
						
						
							
							Initial support of `Follow symbol under cursor' for QML/JS.  
						
						
						
						
					 
					
						2010-02-09 11:37:58 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						25e04d8ef1 
					 
					
						
						
							
							Make QmlJS::Link private. Use Context::build to set up a context.  
						
						
						
						
					 
					
						2010-02-04 10:34:49 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						e984691fe6 
					 
					
						
						
							
							Fix prototype reference resolution for Qml objects.  
						
						
						
						
					 
					
						2010-02-04 10:34:49 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						976d74ca73 
					 
					
						
						
							
							Add support for lazy prototypes.  
						
						... 
						
						
						
						Done-with: ckamm 
						
						
					 
					
						2010-02-03 15:42:32 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						1f0b717ad2 
					 
					
						
						
							
							Completion for global variables in JS.  
						
						... 
						
						
						
						* Support for lookup JS vs Qml
* Bind global variables.
Done-with: ckamm 
						
						
					 
					
						2010-02-03 14:34:06 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						49c43aaab1 
					 
					
						
						
							
							Get rid of Environment, introduce external ScopeChain in Link.  
						
						... 
						
						
						
						Done-with: Roberto 
						
						
					 
					
						2010-02-03 10:59:52 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						ba18e70034 
					 
					
						
						
							
							Introduced QML/JS references.  
						
						... 
						
						
						
						Done with ckamm 
						
						
					 
					
						2010-02-03 10:24:25 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						0f6551c43f 
					 
					
						
						
							
							Introduced ASTObjectValue.  
						
						
						
						
					 
					
						2010-02-01 13:54:59 +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 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						da81d59e24 
					 
					
						
						
							
							Look at the enumerators when populating the completion box.  
						
						
						
						
					 
					
						2010-01-28 15:51:16 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						98474002ad 
					 
					
						
						
							
							Store all the object-based values in the QML/JS interpreter.  
						
						
						
						
					 
					
						2010-01-28 14:20:57 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						cf35a0249b 
					 
					
						
						
							
							Implemented the binding phase for QML.  
						
						... 
						
						
						
						Done-with: Christian Kamm 
						
						
					 
					
						2010-01-26 15:20:18 +01:00 
						 
				 
			
				
					
						
							
							
								Simon Hausmann 
							
						 
					 
					
						
						
							
						
						521c69a744 
					 
					
						
						
							
							Fix compilation without declarative backend  
						
						
						
						
					 
					
						2010-01-26 12:06:58 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						478907e5c3 
					 
					
						
						
							
							Added method defaultValueForBuiltinType(typeName) to the QML/JS interpreter.  
						
						
						
						
					 
					
						2010-01-26 11:15:21 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						84d721078e 
					 
					
						
						
							
							Added some basic support for the attached Keys property.  
						
						
						
						
					 
					
						2010-01-26 11:06:28 +01:00 
						 
				 
			
				
					
						
							
							
								Roberto Raggi 
							
						 
					 
					
						
						
							
						
						2512a684d5 
					 
					
						
						
							
							Show the argument names from the method's signature.  
						
						
						
						
					 
					
						2010-01-26 10:50:55 +01:00