Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp

src/plugins/debugger/debuggermanager.cpp

@@ -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?

src/plugins/debugger/debuggeroutputwindow.cpp

@@ -335,6 +335,9 @@ public slots:
         QString needle2 = QLatin1Char('>') + needle;
         QTextCursor cursor(document());
         do {
+            cursor = document()->find(needle, cursor);
+            if (cursor.isNull())
+                break; // Not found.
             const QString line = cursor.block().text();
             if (line.startsWith(needle) || line.startsWith(needle2)) {
                 setFocus();

src/plugins/debugger/debuggerplugin.cpp

@@ -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()

src/plugins/debugger/gdb/gdbengine.cpp

@@ -1892,6 +1892,7 @@ void GdbEngine::executeStepI()
 void GdbEngine::executeStepOut()
 {
     QTC_ASSERT(state() == InferiorStopped, qDebug() << state());
+    postCommand("-stack-select-frame 0");
     setTokenBarrier();
     setState(InferiorRunningRequested);
     showStatusMessage(tr("Finish function requested..."), 5000);