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

Debugger[CDB]: Disable watchers.

Browse Source 
As they work only in a very limited way and slow down debugging.
This commit is contained in:
Friedemann Kleint
2010-04-16 16:36:00 +02:00
parent 6538ca63bc
commit 70153d1c73
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,6 +130,7 @@ enum DebuggerCapabilities
BreakOnThrowAndCatchCapability = 0x200, BreakOnThrowAndCatchCapability = 0x200,
ReturnFromFunctionCapability = 0x400, ReturnFromFunctionCapability = 0x400,
CreateFullBacktraceCapability = 0x800, CreateFullBacktraceCapability = 0x800,
AddWatcherCapability = 0x1000
}; };
enum LogChannel enum LogChannel

3
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -1817,7 +1817,8 @@ unsigned GdbEngine::debuggerCapabilities() const
| JumpToLineCapability | ReloadModuleCapability | JumpToLineCapability | ReloadModuleCapability
| ReloadModuleSymbolsCapability | BreakOnThrowAndCatchCapability | ReloadModuleSymbolsCapability | BreakOnThrowAndCatchCapability
| ReturnFromFunctionCapability | ReturnFromFunctionCapability
| CreateFullBacktraceCapability; | CreateFullBacktraceCapability
| AddWatcherCapability;
} }
void GdbEngine::continueInferiorInternal() void GdbEngine::continueInferiorInternal()

11
src/plugins/debugger/watchwindow.cpp
View File

@@ -273,11 +273,15 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
QMenu menu; QMenu menu;
QAction *actInsertNewWatchItem = menu.addAction(tr("Insert New Watch Item"));
QAction *actSelectWidgetToWatch = menu.addAction(tr("Select Widget to Watch"));
const bool actionsEnabled = m_manager->debuggerActionsEnabled(); const bool actionsEnabled = m_manager->debuggerActionsEnabled();
const unsigned engineCapabilities = m_manager->debuggerCapabilities(); const unsigned engineCapabilities = m_manager->debuggerCapabilities();
const bool canHandleWatches = actionsEnabled && (engineCapabilities & AddWatcherCapability);
QAction *actInsertNewWatchItem = menu.addAction(tr("Insert New Watch Item"));
actInsertNewWatchItem->setEnabled(canHandleWatches);
QAction *actSelectWidgetToWatch = menu.addAction(tr("Select Widget to Watch"));
actSelectWidgetToWatch->setEnabled(canHandleWatches);
const QString address = model()->data(mi0, AddressRole).toString(); const QString address = model()->data(mi0, AddressRole).toString();
QAction *actWatchKnownMemory = 0; QAction *actWatchKnownMemory = 0;
QAction *actWatchUnknownMemory = new QAction(tr("Open Memory Editor..."), &menu); QAction *actWatchUnknownMemory = new QAction(tr("Open Memory Editor..."), &menu);
@@ -292,6 +296,7 @@ void WatchWindow::contextMenuEvent(QContextMenuEvent *ev)
QAction *actWatchOrRemove; QAction *actWatchOrRemove;
if (m_type == LocalsType) { if (m_type == LocalsType) {
actWatchOrRemove = theDebuggerAction(WatchExpression)->updatedAction(exp); actWatchOrRemove = theDebuggerAction(WatchExpression)->updatedAction(exp);
actWatchOrRemove->setEnabled(canHandleWatches);
} else { } else {
actWatchOrRemove = theDebuggerAction(RemoveWatchExpression)->updatedAction(exp); actWatchOrRemove = theDebuggerAction(RemoveWatchExpression)->updatedAction(exp);
// Also for the case where the user cleared the expression. // Also for the case where the user cleared the expression.