feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch '2.2'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
This commit is contained in:
Bill King
2011-04-05 16:43:24 +02:00
parent 8e5ab20898 fc05015226
commit 5e372a165f
67 changed files with 8640 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1066,6 +1066,7 @@ unsigned CdbEngine::debuggerCapabilities() const
{
return DisassemblerCapability | RegisterCapability | ShowMemoryCapability
|WatchpointCapability|JumpToLineCapability|AddWatcherCapability
|ReloadModuleCapability
|BreakOnThrowAndCatchCapability // Sort-of: Can break on throw().
|BreakConditionCapability|TracePointCapability
|BreakModuleCapability;