diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-03-13 11:25:38 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-03-13 11:25:38 +0100 |
| commit | 0b10ecc718accd8c4d472ba8f3ed5ea6f1856e51 (patch) | |
| tree | 67f63d2b4aa20195910728659cd3c0ba2cb580eb /src/plugins/coreplugin/editormanager | |
| parent | f1985df55dfa81f184c9d29df6cfbb353bf77ffc (diff) | |
| parent | 0bcc983cdbb74baebccfdb09f7d2ffb22ebf950d (diff) | |
| download | qt-creator-0b10ecc718accd8c4d472ba8f3ed5ea6f1856e51.tar.gz | |
Merge remote-tracking branch 'origin/4.6'
Conflicts:
src/plugins/cmakeprojectmanager/cmakeproject.h
src/plugins/debugger/debuggerplugin.cpp
src/plugins/ios/iosrunfactories.cpp
src/plugins/nim/project/nimproject.h
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
src/plugins/qmlprojectmanager/qmlproject.h
src/plugins/qnx/qnxrunconfigurationfactory.cpp
src/plugins/qtsupport/exampleslistmodel.cpp
src/plugins/winrt/winrtrunfactories.cpp
Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
Diffstat (limited to 'src/plugins/coreplugin/editormanager')
| -rw-r--r-- | src/plugins/coreplugin/editormanager/editorview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp index e456421d2f..8c35d26527 100644 --- a/src/plugins/coreplugin/editormanager/editorview.cpp +++ b/src/plugins/coreplugin/editormanager/editorview.cpp @@ -270,7 +270,8 @@ void EditorView::updateEditorHistory(IEditor *editor, QList<EditLocation> &histo for (int i = 0; i < history.size(); ++i) { const EditLocation &item = history.at(i); if (item.document == document - || !DocumentModel::indexOfFilePath(FileName::fromString(item.fileName))) { + || (!item.document + && !DocumentModel::indexOfFilePath(FileName::fromString(item.fileName)))) { history.removeAt(i--); } } |