hjk 
							
						 
					 
					
						
						
							
						
						49cac3d448 
					 
					
						
						
							
							debugger: call shutdownEngine, not shutdownInferior on EngineRunFailed  
						
						... 
						
						
						
						(cherry picked from commit 57f7616286 
						
						
					 
					
						2010-10-27 11:50:25 +02:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						b5c6e15cd3 
					 
					
						
						
							
							debugger: fix EngineSetupFailed path  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2837
(cherry picked from commit 2efdeb5cd0 
						
						
					 
					
						2010-10-27 11:50:25 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						592396c254 
					 
					
						
						
							
							QmlJS: Fix member completion at the end of a nested object definition.  
						
						... 
						
						
						
						The parser's error recovery generates three nested object definitions
for code like
Item { Item { font } }
where the innermost definition corresponds to 'font }' and has an empty
lbrace token.
If we create a Range for this recovered definition, code completion will
fail for 'font.'.
Task-number: QTCREATORBUG-2767
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-10-27 11:32:24 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						2e650d0fa1 
					 
					
						
						
							
							qmldump: Ensure path and environment are taken from the same Qt version.  
						
						... 
						
						
						
						Fixes f1fb0bddb1528999d549 
						
						
					 
					
						2010-10-26 19:35:12 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						791bb483fd 
					 
					
						
						
							
							Debugger/JS Code model: Set environment for QML tools correctly.  
						
						... 
						
						
						
						Set complete build environment (MinGW).
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com >
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
Task-number: QTCREATORBUG-2883
(cherry picked from commit f1fb0bddb1 
						
						
					 
					
						2010-10-26 19:35:05 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kandeler 
							
						 
					 
					
						
						
							
						
						efb173390a 
					 
					
						
						
							
							Fix Creator crash on SSH connection loss.  
						
						... 
						
						
						
						QTCREATORBUG-2890
Reviewed-by: dt 
						
						
					 
					
						2010-10-26 16:29:27 +02:00 
						 
				 
			
				
					
						
							
							
								axasia 
							
						 
					 
					
						
						
							
						
						0a679b61d4 
					 
					
						
						
							
							Update Japanese 2.1 translations.  
						
						... 
						
						
						
						Merge-request: 207
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-26 11:25:22 +02:00 
						 
				 
			
				
					
						
							
							
								Sergey Belyashov 
							
						 
					 
					
						
						
							
						
						6536630b3f 
					 
					
						
						
							
							Updated Russian translation  
						
						... 
						
						
						
						Merge-request: 208
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-26 11:23:49 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						149a59f016 
					 
					
						
						
							
							remove execute bit ... again  
						
						
						
						
					 
					
						2010-10-25 19:23:43 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						110917da4d 
					 
					
						
						
							
							update list of up-to-date translations  
						
						
						
						
					 
					
						2010-10-25 19:20:53 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						51da137c9b 
					 
					
						
						
							
							update german translation  
						
						
						
						
					 
					
						2010-10-25 19:05:53 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						013ab7c5bb 
					 
					
						
						
							
							simplify #include statement  
						
						... 
						
						
						
						helps lupdate 
						
						
					 
					
						2010-10-25 19:05:02 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						b5b6901c9b 
					 
					
						
						
							
							exclude dead/irrelevant sources from string collection  
						
						
						
						
					 
					
						2010-10-25 18:27:29 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						ddf5a01a30 
					 
					
						
						
							
							kill dead source string  
						
						
						
						
					 
					
						2010-10-25 17:50:56 +02:00 
						 
				 
			
				
					
						
							
							
								Sergey Belyashov 
							
						 
					 
					
						
						
							
						
						b10c8db6da 
					 
					
						
						
							
							Fixed double word in message  
						
						... 
						
						
						
						Adjusting the source in all affected translations as well.
Merge-request: 192
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-25 16:46:14 +02:00 
						 
				 
			
				
					
						
							
							
								Sergey Belyashov 
							
						 
					 
					
						
						
							
						
						1d4258a93a 
					 
					
						
						
							
							Updated Russian translation  
						
						... 
						
						
						
						Merge-request: 184
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-25 15:49:15 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						c717c1f9c7 
					 
					
						
						
							
							Debugger: Suppress inconsistencies in gdb binary settings.  
						
						... 
						
						
						
						caused by the merging of global settings.
Terminate list of binaries by an empty element to prevent
accidental reading of consecutive keys.
Add Linux-ICC to list of toolchains for gdb.
Acked-by: hjk
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com >
Task-number: QTCREATORBUG-2848 
						
						
					 
					
						2010-10-25 15:21:36 +02:00 
						 
				 
			
				
					
						
							
							
								axasia 
							
						 
					 
					
						
						
							
						
						387180b053 
					 
					
						
						
							
							L10N: Update Japanese 2.1 translation.  
						
						... 
						
						
						
						Merge-request: 194
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-25 15:14:29 +02:00 
						 
				 
			
				
					
						
							
							
								Victor Ostashevsky 
							
						 
					 
					
						
						
							
						
						0ca605a506 
					 
					
						
						
							
							Ukrainian translation updated  
						
						... 
						
						
						
						Merge-request: 205
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com > 
						
						
					 
					
						2010-10-25 14:32:00 +02:00 
						 
				 
			
				
					
						
							
							
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						593bd0d975 
					 
					
						
						
							
							DebugHelpers: Remove incorrect warning about qmldump requiring 4.7.1  
						
						... 
						
						
						
						qmldump works fine with 4.7.0 (as long as private headers are available).
Reviewed-by: ckamm 
						
						
					 
					
						2010-10-25 14:16:14 +02:00 
						 
				 
			
				
					
						
							
							
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						206a79a3fb 
					 
					
						
						
							
							DebugHelpers: Always update icons after recompile  
						
						... 
						
						
						
						The information about a Qt version (including the debugging helper paths)
is cached. Invalidate the cache after all the debugging helpers have
been built, such that the following icon updates actually get the latest
information.
We do invalidate the cache already before the compilation of
the debugging helpers have started, but QmlDumperTool::canBuild
then triggers a refill of the cache, at a time where the qmldump
executable has not yet been created.
Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-2807 
						
						
					 
					
						2010-10-25 14:15:56 +02:00 
						 
				 
			
				
					
						
							
							
								dt 
							
						 
					 
					
						
						
							
						
						90c1b182b7 
					 
					
						
						
							
							Fix double listing of files  
						
						... 
						
						
						
						Reviewed-By: con
Task-Nr: QTCREATORBUG-2729 
						
						
					 
					
						2010-10-25 14:14:36 +02:00 
						 
				 
			
				
					
						
							
							
								dt 
							
						 
					 
					
						
						
							
						
						4a1f15dbb8 
					 
					
						
						
							
							Qt4ProjectManager: Compress the folderChanged via a small timer  
						
						... 
						
						
						
						Reviewed-By: hunger 
						
						
					 
					
						2010-10-25 14:14:33 +02:00 
						 
				 
			
				
					
						
							
							
								dt 
							
						 
					 
					
						
						
							
						
						3cd9c59679 
					 
					
						
						
							
							Optimize which folders we recursively enumerate  
						
						... 
						
						
						
						Reviewed-By: hunger 
						
						
					 
					
						2010-10-25 14:14:30 +02:00 
						 
				 
			
				
					
						
							
							
								Pierre Rossi 
							
						 
					 
					
						
						
							
						
						f6402f16c7 
					 
					
						
						
							
							French translation updated for Creator 2.1  
						
						... 
						
						
						
						Contributed by the team at developpez.com.
This is the squashed result of a team effort. Authors are:
Guillaume Belz <guillaume.belz@free.fr >
Cédric Bonnier <myzu69@gmail.com >
Jonathan Courtois <jonathan.courtois@gmail.com >
Thibaut Cuvelier <dourouc05@gmail.com >
Pierre-Nicolas Rigal <qt-contrib@p-n-r.com >
For full history, checkout the team's repo:
http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr 
See also: http://qt.developpez.com/ 
Merge-request: 206
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com >
Reviewed-by: ossi 
						
						
					 
					
						2010-10-25 14:05:35 +02:00 
						 
				 
			
				
					
						
							
							
								Christian Kamm 
							
						 
					 
					
						
						
							
						
						6f19835fd8 
					 
					
						
						
							
							C++ indenter: Ensure indent and padding are non-negative.  
						
						... 
						
						
						
						Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-10-25 13:31:42 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						de187cb6fc 
					 
					
						
						
							
							QmlDesigner.model: crash fix  
						
						... 
						
						
						
						Check if the node is really a PropertyChange
Reviewed-by: Marco Bubke 
						
						
					 
					
						2010-10-25 13:31:38 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						70fd2c213e 
					 
					
						
						
							
							QmlDesigner.NodeInstances: crash fix  
						
						... 
						
						
						
						This patch avoids a recursion.
Reviewed-by: Marco Bubke 
						
						
					 
					
						2010-10-25 13:31:37 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						742d9008b6 
					 
					
						
						
							
							QmlDesigner: delete Row/Column and Grid specifics  
						
						... 
						
						
						
						The default panes  are good enough and work fine
Reviewed-by: Kai Koehne 
						
						
					 
					
						2010-10-25 13:31:37 +02:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						c9d6889815 
					 
					
						
						
							
							Another shortcut conflict less on Mac OS.  
						
						... 
						
						
						
						Reviewed-by: Joerg Bornemann 
						
						
					 
					
						2010-10-25 13:19:08 +02:00 
						 
				 
			
				
					
						
							
							
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						b135e60eec 
					 
					
						
						
							
							Doc - update screen shot  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-2530 
						
						
					 
					
						2010-10-25 12:09:05 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						49bb852292 
					 
					
						
						
							
							fix external doc references  
						
						
						
						
					 
					
						2010-10-25 11:18:06 +02:00 
						 
				 
			
				
					
						
							
							
								Leena Miettinen 
							
						 
					 
					
						
						
							
						
						05c24045b0 
					 
					
						
						
							
							Doc - Qt Quick Designer UI in more detail  
						
						... 
						
						
						
						Reviewed-by: Carsten Owerfeldt 
						
						
					 
					
						2010-10-25 11:00:54 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						1a8e48e1a5 
					 
					
						
						
							
							Debugger: Fix compilation with VS2005.  
						
						... 
						
						
						
						Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com > 
						
						
					 
					
						2010-10-22 17:21:03 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						ac9159f872 
					 
					
						
						
							
							Add our own description file to show all possible QML examples.  
						
						... 
						
						
						
						Reviewed-By: con 
						
						
					 
					
						2010-10-22 14:50:44 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						1f09c6bc45 
					 
					
						
						
							
							Debugger/Windows: Do not attach to process being debugged.  
						
						... 
						
						
						
						Reviewed-by: Robert Loehning <robert.loehning@nokia.com >
Task-number: QTCREATORBUG-2086 
						
						
					 
					
						2010-10-22 14:03:25 +02:00 
						 
				 
			
				
					
						
							
							
								Kai Koehne 
							
						 
					 
					
						
						
							
						
						c7e47f53bc 
					 
					
						
						
							
							QmlOutline: Don't use LookupContext due to performance issues  
						
						... 
						
						
						
						Creating a LookupContext can be sloooow for large projects. We create
one instance for every update in the Outline to get the right icons.
Take a shortcut here and just use the element name directly, ignoring
packages names etc.
This is a hot fix for 2.1, a following patch will change the Icon
retrieval API accordingly.
Reviewed-by: Roberto Raggi
Task-number: QTCREATORBUG-2859 
						
						
					 
					
						2010-10-22 13:51:22 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						75e2d42448 
					 
					
						
						
							
							Debugger: Avoid opening of editor in shutdown phase.  
						
						... 
						
						
						
						Remove duplicate code. Introduce ScopedPointer for
location mark. Check shutdown phase when opening editors.
Reviewed-by: con
Task-number: QTCREATORBUG-2833 
						
						
					 
					
						2010-10-22 12:26:13 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						4456f02d07 
					 
					
						
						
							
							Debugger: Suppress Auto-Dereferencing of pointers for char* types.  
						
						... 
						
						
						
						Sequence of processing changed since 2.0.1.
Reviewed-by: hjk
Task-number: QTCREATORBUG-2664 
						
						
					 
					
						2010-10-22 12:06:30 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						6a07c45477 
					 
					
						
						
							
							Debugger: Disable gdb post-mortem debugging on Windows.  
						
						... 
						
						
						
						As it is not able to do the event-handshake required.
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com >
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
Task-number: QTCREATORBUG-2086 
						
						
					 
					
						2010-10-22 11:31:33 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						db671e8202 
					 
					
						
						
							
							Debugger: Avoid crashes when no C++-engine is available.  
						
						... 
						
						
						
						Check for valid runcontrols in various places and initialize
m_engine correcly. In the case of QML-Debugging, handle
NoEngineType.
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com >
Reviewed-by: Kai Koehne <kai.koehne@nokia.com >
Task-number: QTCREATORBUG-2086 
						
						
					 
					
						2010-10-22 11:27:45 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						9eccc9cd27 
					 
					
						
						
							
							update qt help index to 4.7.1  
						
						... 
						
						
						
						the file is "only" one meg after compression, so it isn't as bad as it
looks. and it is sorted now, so further updates should be somewhat less
wasteful.
Reviewed-by: danimo 
						
						
					 
					
						2010-10-21 20:40:11 +02:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						8e993e08e6 
					 
					
						
						
							
							fix one more raw data leak  
						
						... 
						
						
						
						again, qregexp was putting our raw string into its cache - this time
hidden behind a qdir::entrylist().
Reviewed-by: dt
Task-number: QTCREATORBUG-2758 
						
						
					 
					
						2010-10-21 20:02:08 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						f6cd848121 
					 
					
						
						
							
							update changelog  
						
						
						
						
					 
					
						2010-10-21 18:35:28 +02:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						64f26d3f9b 
					 
					
						
						
							
							use http_proxy variable for proxy detection on linux  
						
						... 
						
						
						
						Reviewed-by: con 
						
						
					 
					
						2010-10-21 18:35:28 +02:00 
						 
				 
			
				
					
						
							
							
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						7b043ba1d7 
					 
					
						
						
							
							Stop navigationwidget from going haywire  
						
						... 
						
						
						
						Stop navigationwidget from going haywire when faced with old
configuration data. This issue could lead to different effects:
 * A crash
 * Creator not being able to exit anymore
 * The sidebar being messed up
Task-number: QTCREATORBUG-2780
Reviewed-by: con 
						
						
					 
					
						2010-10-21 18:09:29 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						24a76a73a9 
					 
					
						
						
							
							fix warnings  
						
						... 
						
						
						
						Reviewed-by: Marco Bubke 
						
						
					 
					
						2010-10-21 17:14:27 +02:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						35fe835d02 
					 
					
						
						
							
							Debugger: Catch exception if thread name cannot be determined.  
						
						... 
						
						
						
						As reported on mailing list.
Reviewed-by: hjk
Reviewed-by: Arvid Ephraim Picciani <arvid.picciani@nokia.com > 
						
						
					 
					
						2010-10-21 16:31:04 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						0a043df690 
					 
					
						
						
							
							QmlJsEditor: fixes warning  
						
						... 
						
						
						
						Reviewed-by: Lasse Holmstedt 
						
						
					 
					
						2010-10-21 16:12:57 +02:00 
						 
				 
			
				
					
						
							
							
								Thomas Hartmann 
							
						 
					 
					
						
						
							
						
						408214486f 
					 
					
						
						
							
							QuickToolBar: reduce usage of lookup context  
						
						... 
						
						
						
						Getting the lookup context is expensive. So it is now done only
on user interaction.
Reviewed-by: Roberto Raggi 
						
						
					 
					
						2010-10-21 15:42:26 +02:00