forked from qt-creator/qt-creator
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts: src/plugins/perforce/perforceplugin.cpp
This commit is contained in:
@@ -286,7 +286,7 @@ void ProjectTreeWidget::openItem(const QModelIndex &mainIndex)
|
||||
{
|
||||
Node *node = m_model->nodeForIndex(mainIndex);
|
||||
if (node->nodeType() == FileNodeType) {
|
||||
Core::EditorManager *editorManager = Core::ICore::instance()->editorManager();
|
||||
Core::EditorManager *editorManager = Core::EditorManager::instance();
|
||||
editorManager->openEditor(node->path());
|
||||
editorManager->ensureEditorManagerVisible();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user