diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-06-05 14:19:43 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-06-05 14:19:43 +0200 |
| commit | a503f8bee012839d03bbba106da2eb3312bacd9d (patch) | |
| tree | 36c6c00debfd740f43a1bf0cba1101efe00bd59f /src/plugins/classview/classviewmanager.cpp | |
| parent | c770e7074ff59e394259193f5d21fee15a9d327a (diff) | |
| parent | ea3ac259d0c38a793768345cfa9197ea77d56842 (diff) | |
| download | qt-creator-a503f8bee012839d03bbba106da2eb3312bacd9d.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/extensionsystem/pluginmanager.cpp
src/plugins/coreplugin/documentmanager.cpp
src/plugins/fakevim/fakevimhandler.cpp
Change-Id: Ibc2adc40bad6f10df94c50d66e78dc3f4bcb84c0
Diffstat (limited to 'src/plugins/classview/classviewmanager.cpp')
| -rw-r--r-- | src/plugins/classview/classviewmanager.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index 7cd708f898..a09eb9bf02 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -36,7 +36,6 @@ #include <utils/qtcassert.h> #include <projectexplorer/projectexplorer.h> #include <projectexplorer/session.h> -#include <texteditor/basetexteditor.h> #include <cpptools/cppmodelmanagerinterface.h> #include <cpptools/cpptoolsconstants.h> #include <coreplugin/icore.h> @@ -441,10 +440,7 @@ void Manager::onDocumentUpdated(CPlusPlus::Document::Ptr doc) void Manager::gotoLocation(const QString &fileName, int line, int column) { - bool newEditor = false; - TextEditor::BaseTextEditorWidget::openEditorAt(fileName, line, column, Core::Id(), - Core::EditorManager::IgnoreNavigationHistory, - &newEditor); + Core::EditorManager::openEditorAt(fileName, line, column); } /*! |