Commit 63a472a8 authored by Christian Kandeler's avatar Christian Kandeler

Fix run control startup message for remote targets on Windows

The exectuable path in the user output was always converted to native
separators, even for non-Desktop targets.

Change-Id: I5b43b2da8a2b791472a1fd58940b179dcbaa28d0
Reviewed-by: default avatarhjk <hjk@qt.io>
parent 19203ebb
......@@ -1409,10 +1409,15 @@ void SimpleTargetRunner::start()
m_stopReported = false;
m_launcher.disconnect(this);
QString msg = RunControl::tr("Starting %1...").arg(m_runnable.displayName());
const bool isDesktop = isSynchronousLauncher(runControl());
const QString rawDisplayName = m_runnable.displayName();
const QString displayName = isDesktop
? QDir::toNativeSeparators(rawDisplayName)
: rawDisplayName;
const QString msg = RunControl::tr("Starting %1...").arg(displayName);
appendMessage(msg, Utils::NormalMessageFormat);
if (isSynchronousLauncher(runControl())) {
if (isDesktop) {
connect(&m_launcher, &ApplicationLauncher::appendMessage,
this, &SimpleTargetRunner::appendMessage);
......
......@@ -32,7 +32,6 @@
#include <utils/environment.h>
#include <QDir>
#include <QUrl>
namespace ProjectExplorer {
......@@ -47,7 +46,9 @@ public:
ApplicationLauncher::Mode runMode = ApplicationLauncher::Gui;
IDevice::ConstPtr device; // Override the kit's device. Keep unset by default.
QString displayName() const { return QDir::toNativeSeparators(executable); }
// FIXME: Not necessarily a display name
QString displayName() const { return executable; }
static void *staticTypeId;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment