diff options
| author | Bill King <bill.king@nokia.com> | 2011-04-05 16:43:24 +0200 |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2011-04-05 16:43:24 +0200 |
| commit | 5e372a165f0821c4fd880c40a0d0b5bb09426f93 (patch) | |
| tree | 4827360cdd5f6f230fcd79285f38f095ef74118d /src/plugins/debugger/debuggerconstants.h | |
| parent | 8e5ab208982a2c9c3729464daf80463edaea51a6 (diff) | |
| parent | fc050152264d129768af65a722b402e2c08f51bc (diff) | |
| download | qt-creator-5e372a165f0821c4fd880c40a0d0b5bb09426f93.tar.gz | |
Merge branch '2.2'
Conflicts:
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
Diffstat (limited to 'src/plugins/debugger/debuggerconstants.h')
| -rw-r--r-- | src/plugins/debugger/debuggerconstants.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h index a91ea319a2..36539f291a 100644 --- a/src/plugins/debugger/debuggerconstants.h +++ b/src/plugins/debugger/debuggerconstants.h @@ -162,7 +162,7 @@ enum DebuggerCapabilities ReverseSteppingCapability = 0x1, SnapshotCapability = 0x2, AutoDerefPointersCapability = 0x4, - DisassemblerCapability = 0x80, + DisassemblerCapability = 0x8, RegisterCapability = 0x10, ShowMemoryCapability = 0x20, JumpToLineCapability = 0x40, |