From e8598fa3dd751e20a4d8bf6d7024ee5f8a0bc9da Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 16 Jan 2012 17:33:30 +0100
Subject: [PATCH] debugger: compile fix
Un-breaks cdb engine after 24177e67dea.
Change-Id: Ibf99e1de4178a3d92a213266ecae490db437ca7a
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/cdb/cdbengine.cpp | 7 ++++---
src/plugins/debugger/cdb/cdbengine.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 7e440a52a03..99bb44fc563 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1087,9 +1087,10 @@ void CdbEngine::updateLocalVariable(const QByteArray &iname)
postExtensionCommand(isWatch ? "watches" : "locals", localsArguments, 0, &CdbEngine::handleLocals);
}
-unsigned CdbEngine::debuggerCapabilities() const
+bool CdbEngine::hasCapability(unsigned cap) const
{
- return DisassemblerCapability | RegisterCapability | ShowMemoryCapability
+ return cap & (DisassemblerCapability | RegisterCapability
+ | ShowMemoryCapability
|WatchpointByAddressCapability|JumpToLineCapability|AddWatcherCapability|WatchWidgetsCapability
|ReloadModuleCapability
|BreakOnThrowAndCatchCapability // Sort-of: Can break on throw().
@@ -1097,7 +1098,7 @@ unsigned CdbEngine::debuggerCapabilities() const
|BreakModuleCapability
|OperateByInstructionCapability
|RunToLineCapability
- |MemoryAddressCapability;
+ |MemoryAddressCapability);
}
void CdbEngine::executeStep()
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 5e2c6d5f15f..4ca62ccffb9 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -98,7 +98,7 @@ public:
virtual void detachDebugger();
virtual void updateWatchData(const WatchData &data,
const WatchUpdateFlags & flags = WatchUpdateFlags());
- virtual unsigned debuggerCapabilities() const;
+ virtual bool hasCapability(unsigned cap) const;
virtual void watchPoint(const QPoint &);
virtual void setRegisterValue(int regnr, const QString &value);
--
GitLab