QML Inspector: Disable debug actions when qml inspector is disabled

Reviewed-by: Thomas Hartmann

diff --git a/src/plugins/debugger/debuggeruiswitcher.cpp b/src/plugins/debugger/debuggeruiswitcher.cpp
index a7db110..2c9b223 100644 (file)
--- a/src/plugins/debugger/debuggeruiswitcher.cpp
+++ b/src/plugins/debugger/debuggeruiswitcher.cpp
@@ -153,6 +153,11 @@ DebuggerUISwitcher::~DebuggerUISwitcher()
     delete d;
 }
 
+QStringList DebuggerUISwitcher::supportedLanguages() const
+{
+    return d->m_languages;
+}
+
 void DebuggerUISwitcher::addMenuAction(Core::Command *command, const QString &langName,
                                        const QString &group)
 {

diff --git a/src/plugins/debugger/debuggeruiswitcher.h b/src/plugins/debugger/debuggeruiswitcher.h
index 52a4e1c..522d5fd 100644 (file)
--- a/src/plugins/debugger/debuggeruiswitcher.h
+++ b/src/plugins/debugger/debuggeruiswitcher.h
@@ -77,6 +77,8 @@ public:
     void addMenuAction(Core::Command *command, const QString &langName,
                        const QString &group = QString());
 
+    QStringList supportedLanguages() const;
+
     // Changes the active language UI to the one specified by langName.
     // Does nothing if automatic switching is toggled off from settings.
     void setActiveLanguage(const QString &langName);

diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
index de6e9bb..3307df5 100644 (file)
--- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
@@ -37,7 +37,6 @@
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/applicationlauncher.h>
 #include <utils/qtcassert.h>
-#include <debugger/debuggerconstants.h>
 
 #include <debugger/debuggerconstants.h>
 #include <debugger/debuggeruiswitcher.h>
@@ -147,8 +146,12 @@ QmlRunControlFactory::~QmlRunControlFactory()
 bool QmlRunControlFactory::canRun(RunConfiguration *runConfiguration,
                                   const QString &mode) const
 {
-    Q_UNUSED(mode);
-    return (qobject_cast<QmlProjectRunConfiguration*>(runConfiguration) != 0);
+    QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration*>(runConfiguration);
+    if (mode == ProjectExplorer::Constants::RUNMODE) {
+        return config != 0;
+    } else {
+        return (config != 0) && Debugger::DebuggerUISwitcher::instance()->supportedLanguages().contains(Qml::Constants::LANG_QML);
+    }
 }
 
 RunControl *QmlRunControlFactory::create(RunConfiguration *runConfiguration,