From 62d1d6bf737805fc21c8c42998d94a23a259ba3c Mon Sep 17 00:00:00 2001
From: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Date: Fri, 26 Mar 2010 16:43:12 +0100
Subject: [PATCH] Fixed crash with debugger when qml inspector is not enabled
as plugin
---
src/plugins/debugger/debuggeruiswitcher.cpp | 5 ++++-
src/plugins/qmlinspector/qmlinspectorplugin.cpp | 2 --
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index dfa9936fb5f..903d7cca9d0 100644
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -166,8 +166,11 @@ void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &la
void DebuggerUISwitcher::setActiveLanguage(const QString &langName)
{
- if (theDebuggerAction(SwitchLanguageAutomatically)->isChecked())
+ if (theDebuggerAction(SwitchLanguageAutomatically)->isChecked()
+ && d->m_languages.contains(langName))
+ {
changeDebuggerUI(langName);
+ }
}
int DebuggerUISwitcher::activeLanguageId() const
diff --git a/src/plugins/qmlinspector/qmlinspectorplugin.cpp b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
index 02bab91ae6d..1d8c8414c75 100644
--- a/src/plugins/qmlinspector/qmlinspectorplugin.cpp
+++ b/src/plugins/qmlinspector/qmlinspectorplugin.cpp
@@ -52,8 +52,6 @@
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
-#include <extensionsystem/pluginmanager.h>
-
#include <QtCore/QStringList>
#include <QtCore/QtPlugin>
#include <QtCore/QTimer>
--
GitLab