con 
							
						 
					 
					
						
						
							
						
						7199223a6e 
					 
					
						
						
							
							Merge remote branch 'origin/1.3'  
						
						... 
						
						
						
						Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.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/cppeditor/cppeditor.cpp
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/gdb/gdbengine.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/locator/Locator.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmleditor/QmlEditor.pluginspec
	src/plugins/qmleditor/idcollector.cpp
	src/plugins/qmleditor/idcollector.h
	src/plugins/qmleditor/parser/qmljsglobal_p.h
	src/plugins/qmleditor/qmlcodecompletion.cpp
	src/plugins/qmleditor/qmlcodeformatter.cpp
	src/plugins/qmleditor/qmlcodeformatter.h
	src/plugins/qmleditor/qmlexpressionundercursor.cpp
	src/plugins/qmleditor/qmllookupcontext.cpp
	src/plugins/qmleditor/qmlresolveexpression.cpp
	src/plugins/qmleditor/qmlsymbol.cpp
	src/plugins/qmleditor/qmlsymbol.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	src/shared/qml/parser/qmljsast.cpp
	src/shared/qml/parser/qmljsast_p.h
	src/shared/qml/parser/qmljsastfwd_p.h
	src/shared/qml/parser/qmljsastvisitor.cpp
	src/shared/qml/parser/qmljsastvisitor_p.h
	src/shared/qml/parser/qmljsengine_p.cpp
	src/shared/qml/parser/qmljsengine_p.h
	src/shared/qml/parser/qmljsgrammar.cpp
	src/shared/qml/parser/qmljsgrammar_p.h
	src/shared/qml/parser/qmljslexer.cpp
	src/shared/qml/parser/qmljslexer_p.h
	src/shared/qml/parser/qmljsmemorypool_p.h
	src/shared/qml/parser/qmljsnodepool_p.h
	src/shared/qml/parser/qmljsparser.cpp
	src/shared/qml/parser/qmljsparser_p.h 
						
						
					 
					
						2010-01-12 18:02:04 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						e28968bf39 
					 
					
						
						
							
							Also remove tokens that we consider "lost" from the list.  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2010-01-12 16:54:00 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						cdf06a4b3e 
					 
					
						
						
							
							Remove debug output.  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2010-01-12 16:23:05 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						ff066d5e76 
					 
					
						
						
							
							Fixes: Missing locals & watchers when debugging on Snow Leopard  
						
						... 
						
						
						
						Task-number: QTCREATORBUG-436
Reviewed-by: hjk 
						
						
					 
					
						2010-01-12 15:22:02 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						77b3bf4d7b 
					 
					
						
						
							
							debugger: fix timeout message.  
						
						... 
						
						
						
						(cherry picked from commit 9ee71d7da9 
						
						
					 
					
						2010-01-12 15:13:36 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9ee71d7da9 
					 
					
						
						
							
							debugger: fix timeout message.  
						
						
						
						
					 
					
						2010-01-12 14:31:17 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						40e4837d63 
					 
					
						
						
							
							debugger: add debug message for non-critical timeouts  
						
						
						
						
					 
					
						2010-01-12 14:31:16 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						87d13230c1 
					 
					
						
						
							
							debugger: disable 'continue' as woraround for failing 'step'  
						
						
						
						
					 
					
						2010-01-12 10:53:30 +01:00 
						 
				 
			
				
					
						
							
							
								Tobias Hunger 
							
						 
					 
					
						
						
							
						
						592e494d1a 
					 
					
						
						
							
							Fix typos  
						
						... 
						
						
						
						Reviewed-by: thorbjorn 
						
						
					 
					
						2010-01-11 10:26:13 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9052bd279f 
					 
					
						
						
							
							debugger: fix editor tooltips for new dumpers  
						
						
						
						
					 
					
						2010-01-08 18:17:02 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						945315173f 
					 
					
						
						
							
							Translations: Fix debugger messages  
						
						... 
						
						
						
						Reviewed-by: hjk 
						
						
					 
					
						2010-01-08 11:32:53 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						c283c05d31 
					 
					
						
						
							
							debugger: -break-list should be discardable if we do in in each step  
						
						
						
						
					 
					
						2010-01-07 16:25:18 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						270defaf59 
					 
					
						
						
							
							debugger: go back to explicitly named pointers  
						
						
						
						
					 
					
						2010-01-06 16:38:10 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						ea2101950f 
					 
					
						
						
							
							debugger: move watchdog timeout initialization to a place where it actually can access the stored settings.  
						
						... 
						
						
						
						(cherry picked from commit de23834fc9 
						
						
					 
					
						2010-01-06 15:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						e80e5e5580 
					 
					
						
						
							
							debugger: fix thinko in time out computation  
						
						... 
						
						
						
						(cherry picked from commit 33bdf42953 
						
						
					 
					
						2010-01-06 15:57:11 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						db68ca5b8d 
					 
					
						
						
							
							debugger: gracefully handle commands that might not produce output  
						
						... 
						
						
						
						(cherry picked from commit 1324a1c600 
						
						
					 
					
						2010-01-06 15:57:10 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						0de840cb43 
					 
					
						
						
							
							debugger: make watchdog timeout configurable  
						
						... 
						
						
						
						(cherry picked from commit bf077800b8 
						
						
					 
					
						2010-01-06 15:57:10 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						ca637fdc33 
					 
					
						
						
							
							debugger: make use of full source file list optional  
						
						... 
						
						
						
						(cherry picked from commit 8c52f5720c 
						
						
					 
					
						2010-01-06 15:57:10 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						85b4b826ab 
					 
					
						
						
							
							debugger: use '*' as name for all pointers, add pointee only for display purposes  
						
						
						
						
					 
					
						2010-01-06 15:21:17 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						d10b4edaab 
					 
					
						
						
							
							Gdb/MingW: Fix interrupting inferior.  
						
						... 
						
						
						
						Prevent exec-continue by SIGTRAP-Handler.
Reviewed-by: hjk <qtc-committer@nokia.com > 
						
						
					 
					
						2010-01-06 14:16:35 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						e5abb34db3 
					 
					
						
						
							
							debugger: fix watchers containing '$' (references to registers)  
						
						
						
						
					 
					
						2010-01-06 12:53:37 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						456abf4cbb 
					 
					
						
						
							
							debugger: fix disassembler command (regression introduced in  e3712f968)  
						
						
						
						
					 
					
						2010-01-06 12:17:34 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						e3712f9687 
					 
					
						
						
							
							debugger: refactoring, use QByteArray instead of QString when appropriate  
						
						
						
						
					 
					
						2010-01-05 18:13:24 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						baa955d5ad 
					 
					
						
						
							
							debugger: make python frame output 'Discardable'  
						
						
						
						
					 
					
						2010-01-05 16:48:12 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						11a300dd92 
					 
					
						
						
							
							debugger: refactor passing of options to new dumpers  
						
						
						
						
					 
					
						2010-01-05 16:48:11 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						960f8dc03d 
					 
					
						
						
							
							debugger: -break-list needs a stopped state to show new breakpoints in the gui  
						
						
						
						
					 
					
						2010-01-05 16:48:11 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						7185e42b25 
					 
					
						
						
							
							Merge remote branch 'origin/1.3'  
						
						
						
						
					 
					
						2010-01-05 10:58:06 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						5fd1e3c454 
					 
					
						
						
							
							properly decode messages from gdb  
						
						... 
						
						
						
						... using fromLocal8Bit instead of fromLatin1.
of course the localized messages pose a "challenge" for the various
workarounds which parse them ...
Task-number: QTCREATORBUG-504 
						
						
					 
					
						2010-01-04 14:12:28 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						9ad447b8a4 
					 
					
						
						
							
							debugger: make gdb-6.8-symbianelf work  
						
						
						
						
					 
					
						2010-01-04 13:16:46 +01:00 
						 
				 
			
				
					
						
							
							
								Erik Verbruggen 
							
						 
					 
					
						
						
							
						
						e600c0ddba 
					 
					
						
						
							
							Fixed gdb/python usage on Mac (Snow Leopard).  
						
						... 
						
						
						
						Reviewed by: hjk 
						
						
					 
					
						2009-12-14 12:11:48 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						1324a1c600 
					 
					
						
						
							
							debugger: gracefully handle commands that might not produce output  
						
						
						
						
					 
					
						2009-12-11 18:00:37 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						2548779d1f 
					 
					
						
						
							
							debugger: Remove EmbedToken fglag for gdb commands.  
						
						... 
						
						
						
						The token is not needed anymore. 
						
						
					 
					
						2009-12-11 18:00:36 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						d0dfea5a8a 
					 
					
						
						
							
							debugger: disable some warning, add FIXME  
						
						
						
						
					 
					
						2009-12-10 16:58:54 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						de23834fc9 
					 
					
						
						
							
							debugger: move watchdog timeout initialization to a place where it  
						
						... 
						
						
						
						actually can access the stored settings. 
						
						
					 
					
						2009-12-10 16:58:54 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						33bdf42953 
					 
					
						
						
							
							debugger: fix thinko in time out computation  
						
						
						
						
					 
					
						2009-12-09 19:08:23 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						bf077800b8 
					 
					
						
						
							
							debugger: make watchdog timeout configurable  
						
						
						
						
					 
					
						2009-12-09 17:41:59 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						8c52f5720c 
					 
					
						
						
							
							debugger: make use of full source file list optional  
						
						
						
						
					 
					
						2009-12-09 13:52:12 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						68bd4d2b95 
					 
					
						
						
							
							debugger: refactor the dumper class to make it work with gdb 7.0  
						
						... 
						
						
						
						This is an attempt to make it work with released gdb 7.0. It uses some
ugly workarounds to compensate for the missing gdb.Block and gdb.Symbol
structures. 
						
						
					 
					
						2009-12-09 13:51:17 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						ecb0df0cb5 
					 
					
						
						
							
							debugger: work on "watchers" for use with new dumpers  
						
						
						
						
					 
					
						2009-12-04 17:08:35 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						ef9db9cf79 
					 
					
						
						
							
							debugger: make 'watch' item work with new dumpers  
						
						
						
						
					 
					
						2009-12-04 13:22:59 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						51644c91a6 
					 
					
						
						
							
							debugger: enable locals&watchers update after timeout kicked in  
						
						
						
						
					 
					
						2009-12-01 17:11:09 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						85b6ee648c 
					 
					
						
						
							
							Merge commit 'origin/1.3'  
						
						
						
						
					 
					
						2009-11-30 18:23:13 +01:00 
						 
				 
			
				
					
						
							
							
								Friedemann Kleint 
							
						 
					 
					
						
						
							
						
						e87bd302da 
					 
					
						
						
							
							Debugger: Protect reloadRegisters against early calls.  
						
						... 
						
						
						
						Check for correct state (InferiorStopped). 
						
						
					 
					
						2009-11-30 16:45:15 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						9c66c06820 
					 
					
						
						
							
							mi parser: don't construct dummy tuples, but parse lists directly  
						
						
						
						
					 
					
						2009-11-30 15:55:11 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						36db421fce 
					 
					
						
						
							
							debugger: make dumper exception passing configurable  
						
						
						
						
					 
					
						2009-11-26 14:59:57 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						913f6161a1 
					 
					
						
						
							
							Merge remote branch 'origin/1.3'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp 
						
						
					 
					
						2009-11-20 17:25:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Molkentin 
							
						 
					 
					
						
						
							
						
						40518ac11c 
					 
					
						
						
							
							gdb: On Windows, also substitute the debugging path for non-sdk Qt.  
						
						... 
						
						
						
						Reviewed-By: hjk 
						
						
					 
					
						2009-11-19 19:45:14 +01:00 
						 
				 
			
				
					
						
							
							
								con 
							
						 
					 
					
						
						
							
						
						c718095c28 
					 
					
						
						
							
							Merge commit 'origin/1.3'  
						
						... 
						
						
						
						Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
Reviewed-by: Oswald Buddenhagen 
						
						
					 
					
						2009-11-16 11:35:47 +01:00 
						 
				 
			
				
					
						
							
							
								hjk 
							
						 
					 
					
						
						
							
						
						516af4b1b6 
					 
					
						
						
							
							debugger: access preloaded dumpers also when stopped by a signal  
						
						
						
						
					 
					
						2009-11-13 14:16:44 +01:00 
						 
				 
			
				
					
						
							
							
								Oswald Buddenhagen 
							
						 
					 
					
						
						
							
						
						0939a7f77f 
					 
					
						
						
							
							don't track shared library events on gdb < 7, after all.  
						
						... 
						
						
						
						The problem is that the shlib events disturb bounded execution requests
and there is no way to recover from this - the debugger will effectively
turn "step over" into "continue". this is nicely explained in
http://vladimir_prus.blogspot.com/2007/12/debugger-stories-pending-breakpoints.html  
						
						
					 
					
						2009-11-12 15:36:45 +01:00