diff options
| author | hjk <hjk@qt.io> | 2018-05-16 15:42:03 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2018-05-23 08:48:36 +0000 |
| commit | 36b835ff0ac1f6ab7b2ae8aab789352a9e297c21 (patch) | |
| tree | b3a63ee0ba58ca3bcfdb7631963f452c3658b8c3 /src/plugins/qmlprojectmanager | |
| parent | fdccc542754bc5361b8391ecd3902a88a84ab3cf (diff) | |
| download | qt-creator-36b835ff0ac1f6ab7b2ae8aab789352a9e297c21.tar.gz | |
Finish merging Runnable and StandardRunnable
As all Runnables are known to be StandardRunnables, this here
essentially replaces all .is<StandardRunnable> by 'true'.
.as<StandardRunnable> by no-op, and fixes the fallout.
Change-Id: I1632f8e164fa0a9dff063df47a9e191fdf7bbb2e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qmlprojectmanager')
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 4f6336b90c..cc9fdb2168 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -74,7 +74,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id) Runnable QmlProjectRunConfiguration::runnable() const { - StandardRunnable r; + Runnable r; r.executable = executable(); r.commandLineArguments = commandLineArguments(); r.runMode = ApplicationLauncher::Gui; diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index 5c6d1dca47..6adc5de404 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -27,7 +27,7 @@ #include "qmlprojectmanager_global.h" -#include <projectexplorer/runnables.h> +#include <projectexplorer/runconfiguration.h> namespace Core { class IEditor; } |