diff options
| author | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-10-18 12:39:02 +0200 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@nokia.com> | 2010-10-18 12:40:34 +0200 |
| commit | 50ab71bbdcd9c4bbef85345b37353dd6104447f1 (patch) | |
| tree | 97a109a4f9474a7d99d031bdb4d290b373b2070f /src/plugins/qmlprojectmanager | |
| parent | b5bb0aceee07c86b4f5bc314db58845cf1276bbb (diff) | |
| download | qt-creator-50ab71bbdcd9c4bbef85345b37353dd6104447f1.tar.gz | |
QML: use Qt4 output formatter to get links in errors to work.
Reviewed-by: Tobias Hunger
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 7c270fc5a9..bb8c8db76c 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -46,6 +46,7 @@ #include <qt4projectmanager/qtversionmanager.h> #include <qt4projectmanager/qt4projectmanagerconstants.h> #include <qt4projectmanager/qmlobservertool.h> +#include <qt4projectmanager/qtoutputformatter.h> #include <QFormLayout> #include <QComboBox> @@ -258,6 +259,10 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget() return detailsWidget; } +ProjectExplorer::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const +{ + return new Qt4ProjectManager::QtOutputFormatter(qmlTarget()->qmlProject()); +} QString QmlProjectRunConfiguration::mainScript() const { diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 9b231f430c..5942a76c0a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -83,6 +83,8 @@ public: // RunConfiguration virtual QWidget *createConfigurationWidget(); + ProjectExplorer::OutputFormatter *createOutputFormatter() const; + QVariantMap toMap() const; public slots: |