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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
This commit is contained in:
hjk
2010-06-02 09:57:23 +02:00
parent 89687ddd4b 13e042737f
commit 5806009d29
94 changed files with 5086 additions and 3391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/debugger/debuggermanager.cpp
View File

@@ -1078,8 +1078,11 @@ void DebuggerManager::startNewDebugger(const DebuggerStartParametersPtr &sp)
const unsigned engineCapabilities = d->m_engine->debuggerCapabilities();
theDebuggerAction(OperateByInstruction)
->setEnabled(engineCapabilities & DisassemblerCapability);
d->m_actions.reverseDirectionAction
->setEnabled(engineCapabilities & ReverseSteppingCapability);
const bool canReverse = (engineCapabilities & ReverseSteppingCapability)
&& theDebuggerBoolSetting(EnableReverseDebugging);
d->m_actions.reverseDirectionAction->setChecked(false);
d->m_actions.reverseDirectionAction->setEnabled(canReverse);
}
void DebuggerManager::startFailed()
@@ -1101,6 +1104,7 @@ void DebuggerManager::cleanupViews()
d->m_sourceFilesWindow->removeAll();
d->m_disassemblerViewAgent.cleanup();
d->m_actions.reverseDirectionAction->setChecked(false);
d->m_actions.reverseDirectionAction->setEnabled(false);
hideDebuggerToolTip();
// FIXME: Move to plugin?