summaryrefslogtreecommitdiff
path: root/src/plugins/git
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/git
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/git')
-rw-r--r--src/plugins/git/gitclient.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 6f175fdfad..1e47d1aa63 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -915,10 +915,8 @@ VcsBase::VcsBaseEditorWidget *GitClient::createVcsEditor(
QTC_CHECK(!findExistingVCSEditor(registerDynamicProperty, dynamicPropertyValue));
// Create new, set wait message, set up with source and codec
- Core::IEditor *outputEditor
- = Core::EditorManager::openEditorWithContents(id, &title, m_msgWait.toUtf8(),
- (Core::EditorManager::OpenInOtherSplit
- | Core::EditorManager::NoNewSplits));
+ Core::IEditor *outputEditor = Core::EditorManager::openEditorWithContents(id, &title,
+ m_msgWait.toUtf8());
outputEditor->document()->setProperty(registerDynamicProperty, dynamicPropertyValue);
rc = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(outputEditor);
connect(rc, SIGNAL(annotateRevisionRequested(QString,QString,QString,int)),