From a2bec569e90bcb4012dc365cfbb61236801ee388 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Mon, 26 May 2014 11:47:26 -0400
Subject: [PATCH] CppEditor: Respect navigation history when using cppeditor
 outline

Task-number: QTCREATORBUG-12281
Change-Id: I95aef60943ec76dd035914e0d13aef7b8db8e211
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
---
 src/plugins/cppeditor/cppeditoroutline.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/plugins/cppeditor/cppeditoroutline.cpp b/src/plugins/cppeditor/cppeditoroutline.cpp
index 53427047743..67eab7658d0 100644
--- a/src/plugins/cppeditor/cppeditoroutline.cpp
+++ b/src/plugins/cppeditor/cppeditoroutline.cpp
@@ -250,6 +250,11 @@ void CppEditorOutline::gotoSymbolInEditor()
         return;
 
     const TextEditor::BaseTextEditorWidget::Link &link = CPPEditorWidget::linkToSymbol(symbol);
+    if (!link.hasValidTarget())
+        return;
+
+    Core::EditorManager::cutForwardNavigationHistory();
+    Core::EditorManager::addCurrentPositionToNavigationHistory();
     m_editorWidget->gotoLine(link.targetLine, link.targetColumn);
     Core::EditorManager::activateEditor(m_editorWidget->editor());
 }