feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix run control startup message for remote targets on Windows

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

Change-Id: I5b43b2da8a2b791472a1fd58940b179dcbaa28d0
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2017-10-16 17:01:06 +02:00
parent 19203ebbf7
commit 63a472a81a
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -1409,10 +1409,15 @@ void SimpleTargetRunner::start()
m_stopReported = false; m_stopReported = false;
m_launcher.disconnect(this); 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); appendMessage(msg, Utils::NormalMessageFormat);
if (isSynchronousLauncher(runControl())) { if (isDesktop) {
connect(&m_launcher, &ApplicationLauncher::appendMessage, connect(&m_launcher, &ApplicationLauncher::appendMessage,
this, &SimpleTargetRunner::appendMessage); this, &SimpleTargetRunner::appendMessage);

5
src/plugins/projectexplorer/runnables.h
View File

@@ -32,7 +32,6 @@
#include <utils/environment.h> #include <utils/environment.h>
#include <QDir>
#include <QUrl> #include <QUrl>
namespace ProjectExplorer { namespace ProjectExplorer {
@@ -47,7 +46,9 @@ public:
ApplicationLauncher::Mode runMode = ApplicationLauncher::Gui; ApplicationLauncher::Mode runMode = ApplicationLauncher::Gui;
IDevice::ConstPtr device; // Override the kit's device. Keep unset by default. 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; static void *staticTypeId;
}; };