diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-03-25 11:55:48 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-03-25 11:55:48 +0100 |
| commit | 60c22e8549da8c3391ee8eed9b5af39cfdc5b6a8 (patch) | |
| tree | b26eb8469aea4f5c026603c28fc9284b937b13ba /src/plugins/coreplugin/editortoolbar.cpp | |
| parent | 3fbd95cee4c2bb59d6eef45df06007fead0121ad (diff) | |
| parent | 7a0ee1009b84fd4e6ef8852cc5112a144f3fa50e (diff) | |
| download | qt-creator-60c22e8549da8c3391ee8eed9b5af39cfdc5b6a8.tar.gz | |
Merge remote-tracking branch 'origin/4.9'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/gradientmodel.cpp
Change-Id: I170de608eaae795133105dedb76ae6f93f6e0d92
Diffstat (limited to 'src/plugins/coreplugin/editortoolbar.cpp')
| -rw-r--r-- | src/plugins/coreplugin/editortoolbar.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp index 8f516fc669..c138d9d204 100644 --- a/src/plugins/coreplugin/editortoolbar.cpp +++ b/src/plugins/coreplugin/editortoolbar.cpp @@ -272,8 +272,6 @@ void EditorToolBar::addEditor(IEditor *editor) if (toolBar && !d->m_isStandalone) addCenterToolBar(toolBar); - - updateDocumentStatus(editor->document()); } void EditorToolBar::addCenterToolBar(QWidget *toolBar) @@ -408,10 +406,6 @@ void EditorToolBar::updateDocumentStatus(IDocument *document) return; } - const Utils::optional<int> index = DocumentModel::rowOfDocument(document); - if (QTC_GUARD(index)) - d->m_editorList->setCurrentIndex(*index); - if (document->filePath().isEmpty()) { d->m_lockButton->setIcon(QIcon()); d->m_lockButton->setEnabled(false); |