QmlDebug: Enable 'What are the prerequisites?' link in run configuration

DebuggerLanguageChooser is in utils, which is why we cannot directly open
the URL in the help plugin.

5 files changed, 16 insertions, 1 deletions

diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 366ef0dea4..7a187ba167 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -39,6 +39,7 @@
 #include "cmaketarget.h"
 
 #include <coreplugin/coreconstants.h>
+#include <coreplugin/helpmanager.h>
 #include <projectexplorer/debugginghelper.h>
 #include <utils/qtcassert.h>
 #include <utils/debuggerlanguagechooser.h>
@@ -412,6 +413,8 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
             this, SLOT(useQmlDebuggerToggled(bool)));
     connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
             this, SLOT(qmlDebugServerPortChanged(uint)));
+    connect(m_debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
+            Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
 
     connect(m_environmentWidget, SIGNAL(userChangesChanged()),
             this, SLOT(userChangesChanged()));
diff --git a/src/plugins/coreplugin/helpmanager.h b/src/plugins/coreplugin/helpmanager.h
index 9e1fc826ac..9788c8c76f 100644
--- a/src/plugins/coreplugin/helpmanager.h
+++ b/src/plugins/coreplugin/helpmanager.h
@@ -71,7 +71,6 @@ public:
 
     QUrl findFile(const QUrl &url) const;
     QByteArray fileData(const QUrl &url) const;
-    void handleHelpRequest(const QString &url);
 
     QStringList registeredNamespaces() const;
     QString namespaceFromFile(const QString &file) const;
@@ -87,6 +86,9 @@ public:
     void removeUserDefinedFilter(const QString &filter);
     void addUserDefinedFilter(const QString &filter, const QStringList &attr);
 
+public slots:
+    void handleHelpRequest(const QString &url);
+
 signals:
     void setupFinished();
     void documentationChanged();
diff --git a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp
index 7865865d3b..09e4267909 100644
--- a/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp
+++ b/src/plugins/projectexplorer/customexecutableconfigurationwidget.cpp
@@ -37,6 +37,7 @@
 #include "project.h"
 #include "environmentwidget.h"
 
+#include <coreplugin/helpmanager.h>
 #include <utils/detailswidget.h>
 #include <utils/environment.h>
 #include <utils/pathchooser.h>
@@ -49,6 +50,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QLineEdit>
 
+
 namespace ProjectExplorer {
 namespace Internal {
 
@@ -166,6 +168,8 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
             this, SLOT(useQmlDebuggerToggled(bool)));
     connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
             this, SLOT(qmlDebugServerPortChanged(uint)));
+    connect(m_debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
+            Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
 
     connect(m_runConfiguration, SIGNAL(changed()), this, SLOT(changed()));
 
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
index dfd66b6483..7bd2edf0a2 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp
@@ -36,6 +36,7 @@
 #include "qmlprojecttarget.h"
 #include "qmlproject.h"
 
+#include <coreplugin/helpmanager.h>
 #include <coreplugin/icore.h>
 #include <projectexplorer/environmentwidget.h>
 #include <projectexplorer/projectexplorer.h>
@@ -139,6 +140,8 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
             this, SLOT(useQmlDebuggerToggled(bool)));
     connect(debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
             this, SLOT(qmlDebugServerPortChanged(uint)));
+    connect(debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
+            Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
 
     QtVersionManager *qtVersions = QtVersionManager::instance();
     connect(qtVersions, SIGNAL(qtVersionsChanged(QList<int>)),
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index 690ac117b3..11eeab2cd8 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -49,6 +49,7 @@
 #include <coreplugin/messagemanager.h>
 #include <coreplugin/variablemanager.h>
 #include <coreplugin/ifile.h>
+#include <coreplugin/helpmanager.h>
 #include <projectexplorer/buildstep.h>
 #include <projectexplorer/environmentwidget.h>
 #include <projectexplorer/persistentsettings.h>
@@ -307,6 +308,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
             this, SLOT(useQmlDebuggerToggled(bool)));
     connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
             this, SLOT(qmlDebugServerPortChanged(uint)));
+    connect(m_debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
+            Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
 
     connect(m_environmentWidget, SIGNAL(userChangesChanged()),
             this, SLOT(userChangesEdited()));