From d79e6e79be34d8da73018cc6bbb23a2ae49c4b98 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 28 Sep 2010 11:14:23 +0200
Subject: [PATCH] QmlDebugging: Don't rely on QmlInspector plugin to be active
Allow to switch to Qml layout, even if QmlInspector plugin is disabled.
Reviewed-by: Lasse Holmstedt
---
src/plugins/debugger/debuggerplugin.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 34d1b5b591f..bd35968ac09 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2168,8 +2168,7 @@ void DebuggerPluginPrivate::setSimpleDockWidgetArrangement
if ((activeLanguages.testFlag(CppLanguage)
&& !activeLanguages.testFlag(QmlLanguage))
- || activeLanguages == AnyLanguage
- || !uiSwitcher->qmlInspectorWindow()) {
+ || activeLanguages == AnyLanguage) {
m_stackDock->show();
m_breakDock->show();
m_watchDock->show();
@@ -2180,7 +2179,8 @@ void DebuggerPluginPrivate::setSimpleDockWidgetArrangement
m_breakDock->show();
m_watchDock->show();
m_scriptConsoleDock->show();
- uiSwitcher->qmlInspectorWindow()->show();
+ if (uiSwitcher->qmlInspectorWindow())
+ uiSwitcher->qmlInspectorWindow()->show();
}
mw->splitDockWidget(mw->toolBarDockWidget(), m_stackDock, Qt::Vertical);
mw->splitDockWidget(m_stackDock, m_watchDock, Qt::Horizontal);
--
GitLab