diff options
author | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-19 12:15:14 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-19 13:12:34 +0100 |
commit | d9e6854a0879ad46cfd1a110b63be2629d1caf44 (patch) | |
tree | 8d8558375cb63e794802abd50f1b3eac87ae36e5 /src | |
parent | 3b5e84e650c1c9219766c1edbbd8addb897f389a (diff) | |
download | qt-creator-d9e6854a0879ad46cfd1a110b63be2629d1caf44.tar.gz |
RemoteLinux: Never disable the run configuration.
The current implementation disables the run config if the build system
does not supply information about which executable to run. But this is
too restrictive, because users can set the executable manually.
Change-Id: Ia792c06063ca88ad7168a0dd96131266e8aaf1cb
Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp | 8 | ||||
-rw-r--r-- | src/plugins/remotelinux/remotelinuxrunconfiguration.cpp | 5 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp b/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp index 8433ace8a9..be3ba91a5f 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp +++ b/src/plugins/projectexplorer/devicesupport/deviceapplicationrunner.cpp @@ -35,6 +35,7 @@ #include <utils/environment.h> #include <utils/qtcassert.h> +#include <QCoreApplication> #include <QStringList> #include <QTimer> @@ -99,6 +100,13 @@ void DeviceApplicationRunner::start(const IDevice::ConstPtr &device, return; } + if (command.isEmpty()) { + emit reportError(QCoreApplication::translate("RemoteLinux::RemoteLinuxRunConfiguration", + "Don't know what to run.")); // FIXME: Transitional message for 3.0. + setFinished(); + return; + } + d->stopRequested = false; d->success = true; diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp index 5b872ecde7..7f3bcf15b3 100644 --- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp @@ -120,11 +120,6 @@ void RemoteLinuxRunConfiguration::init() bool RemoteLinuxRunConfiguration::isEnabled() const { - if (remoteExecutableFilePath().isEmpty()) { - d->disabledReason = tr("Don't know what to run."); - return false; - } - d->disabledReason.clear(); return true; } |