From c9330dc66ecc973d1e668c07211e3d2f455c3dc1 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 31 Oct 2011 13:33:29 +0100
Subject: [PATCH] Debugger: Avoid runtime warning when QmlJSInspector plugin is
not loaded
Check whether there's actually a toolbar for QML registered.
Change-Id: I58ba1330c2bbc4ac0a8962474662a5e76e902f17
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
src/plugins/debugger/debuggermainwindow.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 3a503ad2a01..91bddc318ae 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -353,7 +353,8 @@ void DebuggerMainWindowPrivate::activateQmlCppLayout()
ICore *core = ICore::instance();
Context qmlCppContext = m_contextsForLanguage.value(QmlLanguage);
qmlCppContext.add(m_contextsForLanguage.value(CppLanguage));
- m_toolBarStack->setCurrentWidget(m_toolBars.value(QmlLanguage));
+ if (m_toolBars.contains(QmlLanguage))
+ m_toolBarStack->setCurrentWidget(m_toolBars.value(QmlLanguage));
if (m_previousDebugLanguages & QmlLanguage) {
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
--
GitLab