From 8b57492f354e62a9723fbf094c5b53eb7437e4f4 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@theqtcompany.com>
Date: Tue, 18 Nov 2014 08:52:44 +0100
Subject: [PATCH] EditorManager: Introduce flag to not switch to design mode

Change-Id: I004c00e9f9dd61cc5495790b8e83dd857b404193
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
---
 src/plugins/coreplugin/editormanager/editormanager.cpp | 2 +-
 src/plugins/coreplugin/editormanager/editormanager.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 0bd10af7ae1..5eba28ce80e 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1006,7 +1006,7 @@ IEditor *EditorManagerPrivate::activateEditor(EditorView *view, IEditor *editor,
         setCurrentEditor(editor, (flags & EditorManager::IgnoreNavigationHistory));
         if (!(flags & EditorManager::DoNotMakeVisible)) {
             // switch to design mode?
-            if (editor->isDesignModePreferred()) {
+            if (!(flags & EditorManager::DoNotSwitchToDesignMode) && editor->isDesignModePreferred()) {
                 ModeManager::activateMode(Core::Constants::MODE_DESIGN);
                 ModeManager::setFocusToCurrentMode();
             } else {
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index 41cb9c2993d..e4393c3dc99 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -106,7 +106,8 @@ public:
         IgnoreNavigationHistory = 2,
         DoNotMakeVisible = 4,
         CanContainLineNumber = 8,
-        OpenInOtherSplit = 16
+        OpenInOtherSplit = 16,
+        DoNotSwitchToDesignMode = 32
     };
     Q_DECLARE_FLAGS(OpenEditorFlags, OpenEditorFlag)