summaryrefslogtreecommitdiff
path: root/src/plugins/subversion
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@digia.com>2014-06-17 14:41:59 +0200
committerEike Ziller <eike.ziller@digia.com>2014-06-17 15:40:40 +0200
commit836e17a57cab9fd94a0ee490ee33870df106e2bd (patch)
treebdc97212d357d4463d91f28b4db9158e39335326 /src/plugins/subversion
parent5a9c1bfafa79f3ab582fa31a9181ccf55ae5a5d7 (diff)
downloadqt-creator-836e17a57cab9fd94a0ee490ee33870df106e2bd.tar.gz
Revert "VCS: Open diff/blame editors in other split"
This change has lead to complaints about diff views opening in apparently random places for users with several splits. This reverts commit 02b3a79c5f30cd5c808408caff598f2f4f0a299f. Conflicts: src/plugins/diffeditor/diffeditorplugin.cpp src/plugins/subversion/subversionplugin.cpp Change-Id: I2eab8ff2d88a9e12f4dc7ec3a9ca65455daf15e2 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r--src/plugins/subversion/subversionplugin.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 71aa673463..942fd1ab20 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1032,9 +1032,7 @@ IEditor *SubversionPlugin::showOutputInEditor(const QString &title, const QStrin
qDebug() << "SubversionPlugin::showOutputInEditor" << title << id.name()
<< "Size= " << output.size() << " Type=" << editorType << debugCodec(codec);
QString s = title;
- IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8(),
- (EditorManager::OpenInOtherSplit
- | EditorManager::NoNewSplits));
+ IEditor *editor = EditorManager::openEditorWithContents(id, &s, output.toUtf8());
connect(editor, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),
this, SLOT(annotateVersion(QString,QString,QString,int)));
SubversionEditor *e = qobject_cast<SubversionEditor*>(editor->widget());