aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
diff options
context:
space:
mode:
authorhjk <[email protected]>2016-01-25 15:00:20 +0100
committerhjk <[email protected]>2016-01-26 10:09:29 +0000
commit9ae2ce76297ef899e9c4444f736ede4706c7ece4 (patch)
tree660cd2d30ad4e0d4393e68e66cb738d2e2afd38c /src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
parent4ea8caccf24451ab70db3bc4aa5ee36859e41684 (diff)
ProjectExplorer: Drop LocalApplicationRunConfiguration
The functionality can be provided by producing a suitable Runnable in the derived classes directly. Change-Id: I7b8e8fe33fffd2b00176b6cf6633eca4e152e466 Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h')
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
index a57e5b66df4..e271d84fa61 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
@@ -28,7 +28,7 @@
#include "qmlprojectmanager_global.h"
-#include <projectexplorer/localapplicationrunconfiguration.h>
+#include <projectexplorer/runnables.h>
#include <QPointer>
@@ -46,7 +46,7 @@ namespace Internal {
class QmlProjectRunConfigurationWidget;
}
-class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
+class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplorer::RunConfiguration
{
Q_OBJECT
friend class Internal::QmlProjectRunConfigurationFactory;
@@ -56,11 +56,8 @@ class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplor
public:
QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
- QString executable() const override;
- ProjectExplorer::ApplicationLauncher::Mode runMode() const override;
- QString commandLineArguments() const override;
+ ProjectExplorer::Runnable runnable() const override;
- QString workingDirectory() const override;
QtSupport::BaseQtVersion *qtVersion() const;
enum MainScriptSource {
@@ -96,6 +93,10 @@ protected:
private:
void ctor();
+
+ QString executable() const;
+ QString commandLineArguments() const;
+
static bool isValidVersion(QtSupport::BaseQtVersion *version);
static QString canonicalCapsPath(const QString &filePath);