forked from qt-creator/qt-creator
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.
This commit is contained in:
@@ -58,7 +58,9 @@ DebuggerLanguageChooser::DebuggerLanguageChooser(QWidget *parent) :
|
|||||||
|
|
||||||
m_debugServerPortLabel->setBuddy(m_debugServerPort);
|
m_debugServerPortLabel->setBuddy(m_debugServerPort);
|
||||||
|
|
||||||
m_qmlDebuggerInfoLabel = new QLabel(tr("<a href=\"qthelp://com.nokia.qtcreator/doc/creator-qml-debugging.html\">What are the prerequisites?</a>"));
|
m_qmlDebuggerInfoLabel = new QLabel(tr("<a href=\"qthelp://com.nokia.qtcreator/doc/creator-debugging-qml.html\">What are the prerequisites?</a>"));
|
||||||
|
connect(m_qmlDebuggerInfoLabel, SIGNAL(linkActivated(QString)),
|
||||||
|
this, SIGNAL(openHelpUrl(QString)));
|
||||||
|
|
||||||
connect(m_useQmlDebugger, SIGNAL(toggled(bool)), m_debugServerPort, SLOT(setEnabled(bool)));
|
connect(m_useQmlDebugger, SIGNAL(toggled(bool)), m_debugServerPort, SLOT(setEnabled(bool)));
|
||||||
connect(m_useQmlDebugger, SIGNAL(toggled(bool)), m_debugServerPortLabel, SLOT(setEnabled(bool)));
|
connect(m_useQmlDebugger, SIGNAL(toggled(bool)), m_debugServerPortLabel, SLOT(setEnabled(bool)));
|
||||||
@@ -131,4 +133,5 @@ void DebuggerLanguageChooser::onDebugServerPortChanged(int port)
|
|||||||
emit qmlDebugServerPortChanged((uint)port);
|
emit qmlDebugServerPortChanged((uint)port);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
} // namespace Utils
|
} // namespace Utils
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ signals:
|
|||||||
void cppLanguageToggled(bool value);
|
void cppLanguageToggled(bool value);
|
||||||
void qmlLanguageToggled(bool value);
|
void qmlLanguageToggled(bool value);
|
||||||
void qmlDebugServerPortChanged(uint port);
|
void qmlDebugServerPortChanged(uint port);
|
||||||
|
void openHelpUrl(const QString &url);
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void useCppDebuggerToggled(bool toggled);
|
void useCppDebuggerToggled(bool toggled);
|
||||||
|
|||||||
@@ -39,6 +39,7 @@
|
|||||||
#include "cmaketarget.h"
|
#include "cmaketarget.h"
|
||||||
|
|
||||||
#include <coreplugin/coreconstants.h>
|
#include <coreplugin/coreconstants.h>
|
||||||
|
#include <coreplugin/helpmanager.h>
|
||||||
#include <projectexplorer/debugginghelper.h>
|
#include <projectexplorer/debugginghelper.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
#include <utils/debuggerlanguagechooser.h>
|
#include <utils/debuggerlanguagechooser.h>
|
||||||
@@ -412,6 +413,8 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
|
|||||||
this, SLOT(useQmlDebuggerToggled(bool)));
|
this, SLOT(useQmlDebuggerToggled(bool)));
|
||||||
connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
||||||
this, SLOT(qmlDebugServerPortChanged(uint)));
|
this, SLOT(qmlDebugServerPortChanged(uint)));
|
||||||
|
connect(m_debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
|
||||||
|
Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
|
||||||
|
|
||||||
connect(m_environmentWidget, SIGNAL(userChangesChanged()),
|
connect(m_environmentWidget, SIGNAL(userChangesChanged()),
|
||||||
this, SLOT(userChangesChanged()));
|
this, SLOT(userChangesChanged()));
|
||||||
|
|||||||
@@ -71,7 +71,6 @@ public:
|
|||||||
|
|
||||||
QUrl findFile(const QUrl &url) const;
|
QUrl findFile(const QUrl &url) const;
|
||||||
QByteArray fileData(const QUrl &url) const;
|
QByteArray fileData(const QUrl &url) const;
|
||||||
void handleHelpRequest(const QString &url);
|
|
||||||
|
|
||||||
QStringList registeredNamespaces() const;
|
QStringList registeredNamespaces() const;
|
||||||
QString namespaceFromFile(const QString &file) const;
|
QString namespaceFromFile(const QString &file) const;
|
||||||
@@ -87,6 +86,9 @@ public:
|
|||||||
void removeUserDefinedFilter(const QString &filter);
|
void removeUserDefinedFilter(const QString &filter);
|
||||||
void addUserDefinedFilter(const QString &filter, const QStringList &attr);
|
void addUserDefinedFilter(const QString &filter, const QStringList &attr);
|
||||||
|
|
||||||
|
public slots:
|
||||||
|
void handleHelpRequest(const QString &url);
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void setupFinished();
|
void setupFinished();
|
||||||
void documentationChanged();
|
void documentationChanged();
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
#include "project.h"
|
#include "project.h"
|
||||||
#include "environmentwidget.h"
|
#include "environmentwidget.h"
|
||||||
|
|
||||||
|
#include <coreplugin/helpmanager.h>
|
||||||
#include <utils/detailswidget.h>
|
#include <utils/detailswidget.h>
|
||||||
#include <utils/environment.h>
|
#include <utils/environment.h>
|
||||||
#include <utils/pathchooser.h>
|
#include <utils/pathchooser.h>
|
||||||
@@ -49,6 +50,7 @@
|
|||||||
#include <QtGui/QLabel>
|
#include <QtGui/QLabel>
|
||||||
#include <QtGui/QLineEdit>
|
#include <QtGui/QLineEdit>
|
||||||
|
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|
||||||
@@ -166,6 +168,8 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
|
|||||||
this, SLOT(useQmlDebuggerToggled(bool)));
|
this, SLOT(useQmlDebuggerToggled(bool)));
|
||||||
connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
||||||
this, SLOT(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()));
|
connect(m_runConfiguration, SIGNAL(changed()), this, SLOT(changed()));
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@
|
|||||||
#include "qmlprojecttarget.h"
|
#include "qmlprojecttarget.h"
|
||||||
#include "qmlproject.h"
|
#include "qmlproject.h"
|
||||||
|
|
||||||
|
#include <coreplugin/helpmanager.h>
|
||||||
#include <coreplugin/icore.h>
|
#include <coreplugin/icore.h>
|
||||||
#include <projectexplorer/environmentwidget.h>
|
#include <projectexplorer/environmentwidget.h>
|
||||||
#include <projectexplorer/projectexplorer.h>
|
#include <projectexplorer/projectexplorer.h>
|
||||||
@@ -139,6 +140,8 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun
|
|||||||
this, SLOT(useQmlDebuggerToggled(bool)));
|
this, SLOT(useQmlDebuggerToggled(bool)));
|
||||||
connect(debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
connect(debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
||||||
this, SLOT(qmlDebugServerPortChanged(uint)));
|
this, SLOT(qmlDebugServerPortChanged(uint)));
|
||||||
|
connect(debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
|
||||||
|
Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
|
||||||
|
|
||||||
QtVersionManager *qtVersions = QtVersionManager::instance();
|
QtVersionManager *qtVersions = QtVersionManager::instance();
|
||||||
connect(qtVersions, SIGNAL(qtVersionsChanged(QList<int>)),
|
connect(qtVersions, SIGNAL(qtVersionsChanged(QList<int>)),
|
||||||
|
|||||||
@@ -49,6 +49,7 @@
|
|||||||
#include <coreplugin/messagemanager.h>
|
#include <coreplugin/messagemanager.h>
|
||||||
#include <coreplugin/variablemanager.h>
|
#include <coreplugin/variablemanager.h>
|
||||||
#include <coreplugin/ifile.h>
|
#include <coreplugin/ifile.h>
|
||||||
|
#include <coreplugin/helpmanager.h>
|
||||||
#include <projectexplorer/buildstep.h>
|
#include <projectexplorer/buildstep.h>
|
||||||
#include <projectexplorer/environmentwidget.h>
|
#include <projectexplorer/environmentwidget.h>
|
||||||
#include <projectexplorer/persistentsettings.h>
|
#include <projectexplorer/persistentsettings.h>
|
||||||
@@ -307,6 +308,8 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
|
|||||||
this, SLOT(useQmlDebuggerToggled(bool)));
|
this, SLOT(useQmlDebuggerToggled(bool)));
|
||||||
connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
connect(m_debuggerLanguageChooser, SIGNAL(qmlDebugServerPortChanged(uint)),
|
||||||
this, SLOT(qmlDebugServerPortChanged(uint)));
|
this, SLOT(qmlDebugServerPortChanged(uint)));
|
||||||
|
connect(m_debuggerLanguageChooser, SIGNAL(openHelpUrl(QString)),
|
||||||
|
Core::HelpManager::instance(), SLOT(handleHelpRequest(QString)));
|
||||||
|
|
||||||
connect(m_environmentWidget, SIGNAL(userChangesChanged()),
|
connect(m_environmentWidget, SIGNAL(userChangesChanged()),
|
||||||
this, SLOT(userChangesEdited()));
|
this, SLOT(userChangesEdited()));
|
||||||
|
|||||||
Reference in New Issue
Block a user