democompositor: Move to start by AppEntry

The AppEntry contains the executable name and the $PATH to use.
Store a copy of the AppEntry and pass it to the processlauncher.

Change-Id: I15792cc7ce651beed2006841c100b31d3252d9d1
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

1 files changed, 13 insertions, 4 deletions

diff --git a/wayland/democompositor/processlauncher.cpp b/wayland/democompositor/processlauncher.cpp
index a25fbd5..f0e465e 100644
--- a/wayland/democompositor/processlauncher.cpp
+++ b/wayland/democompositor/processlauncher.cpp
@@ -49,9 +49,12 @@
 ****************************************************************************/
 
 #include "processlauncher.h"
+#include "apps/appentry.h"
 
 #include <QProcess>
 
+Q_LOGGING_CATEGORY(procs, "launcher.procs")
+
 WaylandProcessLauncher::WaylandProcessLauncher(QObject *parent)
     : QObject(parent)
 {
@@ -61,16 +64,22 @@ WaylandProcessLauncher::~WaylandProcessLauncher()
 {
 }
 
-void WaylandProcessLauncher::launch(const QString &program)
+void WaylandProcessLauncher::launch(const AppEntry &entry)
 {
+    qCDebug(procs) << "Launching" << entry.executableName;
+
     QProcess *process = new QProcess(this);
     connect(process, static_cast<void(QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished),
             process, &QProcess::deleteLater);
     connect(process, &QProcess::errorOccurred, &QProcess::deleteLater);
 
+    if (!entry.executablePath.isNull()) {
+        auto env = QProcessEnvironment::systemEnvironment();
+        env.insert(QStringLiteral("PATH"), entry.executablePath);
+        process->setProcessEnvironment(env);
+    }
+
     QStringList arguments;
     arguments << "-platform" << "wayland";
-    process->start(program, arguments);
-
+    process->start(entry.executableName, arguments);
 }
-