ProjectExplorer: Use Utils::FileName for Runnable::executable

Change-Id: I584bc18aa19a4c9886af7b13e95052dfd4350b34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

4 files changed, 12 insertions, 12 deletions

diff --git a/src/plugins/qnx/qnxdebugsupport.cpp b/src/plugins/qnx/qnxdebugsupport.cpp
index 0ea96961dc..ed67dc8a35 100644
--- a/src/plugins/qnx/qnxdebugsupport.cpp
+++ b/src/plugins/qnx/qnxdebugsupport.cpp
@@ -109,7 +109,7 @@ private:
         QStringList arguments;
         if (m_portsGatherer->useGdbServer()) {
             Port pdebugPort = m_portsGatherer->gdbServerPort();
-            r.executable = Constants::QNX_DEBUG_EXECUTABLE;
+            r.executable = FilePath::fromString(Constants::QNX_DEBUG_EXECUTABLE);
             arguments.append(pdebugPort.toString());
         }
         if (m_portsGatherer->useQmlServer()) {
@@ -183,7 +183,7 @@ public:
     }
 
     QString projectSource() const { return m_projectSource->path(); }
-    QString localExecutable() const { return m_localExecutable->path(); }
+    FilePath localExecutable() const { return m_localExecutable->fileName(); }
 
 private:
     PathChooser *m_projectSource;
@@ -209,7 +209,7 @@ private:
         Port pdebugPort = m_portsGatherer->gdbServerPort();
 
         Runnable r;
-        r.executable = Constants::QNX_DEBUG_EXECUTABLE;
+        r.executable = FilePath::fromString(Constants::QNX_DEBUG_EXECUTABLE);
         r.commandLineArguments = pdebugPort.toString();
         setRunnable(r);
 
@@ -258,10 +258,10 @@ void QnxAttachDebugSupport::showProcessesDialog()
     DeviceProcessItem process = dlg.currentProcess();
     const int pid = process.pid;
 //    QString projectSourceDirectory = dlg.projectSource();
-    QString localExecutable = dlg.localExecutable();
+    FilePath localExecutable = dlg.localExecutable();
     if (localExecutable.isEmpty()) {
         if (auto aspect = runConfig->aspect<SymbolFileAspect>())
-            localExecutable = aspect->fileName().toString();
+            localExecutable = aspect->fileName();
     }
 
     auto runControl = new RunControl(ProjectExplorer::Constants::DEBUG_RUN_MODE);
diff --git a/src/plugins/qnx/qnxdevice.cpp b/src/plugins/qnx/qnxdevice.cpp
index 28128bb000..52aa5df08a 100644
--- a/src/plugins/qnx/qnxdevice.cpp
+++ b/src/plugins/qnx/qnxdevice.cpp
@@ -62,7 +62,7 @@ class QnxPortsGatheringMethod : public PortsGatheringMethod
     {
         Q_UNUSED(protocol);
         Runnable runnable;
-        runnable.executable = "netstat";
+        runnable.executable = FileName::fromString("netstat");
         runnable.commandLineArguments = "-na";
         return runnable;
     }
@@ -110,7 +110,7 @@ void QnxDevice::updateVersionNumber() const
     QObject::connect(&versionNumberProcess, &DeviceProcess::error, &eventLoop, &QEventLoop::quit);
 
     Runnable r;
-    r.executable = QLatin1String("uname");
+    r.executable = FileName::fromString("uname");
     r.commandLineArguments = QLatin1String("-r");
     versionNumberProcess.start(r);
 
diff --git a/src/plugins/qnx/qnxdeviceprocess.cpp b/src/plugins/qnx/qnxdeviceprocess.cpp
index 46067672dc..9b8459b34e 100644
--- a/src/plugins/qnx/qnxdeviceprocess.cpp
+++ b/src/plugins/qnx/qnxdeviceprocess.cpp
@@ -47,7 +47,7 @@ QnxDeviceProcess::QnxDeviceProcess(const QSharedPointer<const IDevice> &device,
 QString QnxDeviceProcess::fullCommandLine(const Runnable &runnable) const
 {
     QStringList args = QtcProcess::splitArgs(runnable.commandLineArguments);
-    args.prepend(runnable.executable);
+    args.prepend(runnable.executable.toString());
     QString cmd = QtcProcess::Arguments::createUnixArgs(args).toString();
 
     QString fullCommandLine = QLatin1String(
@@ -71,7 +71,7 @@ void QnxDeviceProcess::doSignal(int sig)
 {
     auto signaler = new SshDeviceProcess(device(), this);
     Runnable r;
-    r.executable = QString::fromLatin1("kill -%2 `cat %1`").arg(m_pidFile).arg(sig);
+    r.executable = FileName::fromString(QString("kill -%2 `cat %1`").arg(m_pidFile).arg(sig));
     connect(signaler, &SshDeviceProcess::finished, signaler, &QObject::deleteLater);
     signaler->start(r);
 }
diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp
index aec6d74a6f..19c1670740 100644
--- a/src/plugins/qnx/slog2inforunner.cpp
+++ b/src/plugins/qnx/slog2inforunner.cpp
@@ -73,7 +73,7 @@ void Slog2InfoRunner::printMissingWarning()
 void Slog2InfoRunner::start()
 {
     Runnable r;
-    r.executable = QLatin1String("slog2info");
+    r.executable = Utils::FilePath::fromString("slog2info");
     m_testProcess->start(r);
     reportStarted();
 }
@@ -111,7 +111,7 @@ void Slog2InfoRunner::handleTestProcessCompleted()
 void Slog2InfoRunner::readLaunchTime()
 {
     Runnable r;
-    r.executable = QLatin1String("date");
+    r.executable = Utils::FilePath::fromString("date");
     r.commandLineArguments = QLatin1String("+\"%d %H:%M:%S\"");
     m_launchDateTimeProcess->start(r);
 }
@@ -128,7 +128,7 @@ void Slog2InfoRunner::launchSlog2Info()
                                              QString::fromLatin1("dd HH:mm:ss"));
 
     Runnable r;
-    r.executable = QLatin1String("slog2info");
+    r.executable = Utils::FilePath::fromString("slog2info");
     r.commandLineArguments = QLatin1String("-w");
     m_logProcess->start(r);
 }