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

2
src/plugins/debugger/debuggerconstants.h
View File

@@ -162,7 +162,7 @@ enum DebuggerCapabilities
ReverseSteppingCapability = 0x1,
SnapshotCapability = 0x2,
AutoDerefPointersCapability = 0x4,
DisassemblerCapability = 0x80,
DisassemblerCapability = 0x8,
RegisterCapability = 0x10,
ShowMemoryCapability = 0x20,
JumpToLineCapability = 0x40,