Merge remote branch 'origin/2.0'

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
94 changed files with 5086 additions and 3391 deletions

View File

@@ -1539,8 +1539,8 @@ void DebuggerPlugin::enableReverseDebuggingTriggered(const QVariant &value)
{
QTC_ASSERT(m_reverseToolButton, return);
m_reverseToolButton->setVisible(value.toBool());
if (!value.toBool())
m_manager->debuggerManagerActions().reverseDirectionAction->setChecked(false);
m_manager->debuggerManagerActions().reverseDirectionAction->setChecked(false);
m_manager->debuggerManagerActions().reverseDirectionAction->setEnabled(value.toBool());
}
void DebuggerPlugin::toggleBreakpoint()