From 68c70328ec2477badf93618b7402b59551901061 Mon Sep 17 00:00:00 2001 From: Kimmo Ollila Date: Mon, 18 Dec 2023 15:31:48 +0200 Subject: Add custom socket name to be used in Demo Launcher Change-Id: I76e58d38d8d696d3c9c939b97afb6fe54018cb40 Reviewed-by: Samuli Piippo --- QtLauncher/LauncherCompositor.qml | 2 ++ QtLauncher/engine.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/QtLauncher/LauncherCompositor.qml b/QtLauncher/LauncherCompositor.qml index fc7ca15..2f0dfa7 100644 --- a/QtLauncher/LauncherCompositor.qml +++ b/QtLauncher/LauncherCompositor.qml @@ -7,6 +7,8 @@ import QtWayland.Compositor.IviApplication WaylandCompositor { id: waylandCompositor + socketName: "boot2qt-democompositor" + property bool scalableDemo: false property string appsRoot: "" property ListModel shellSurfaces: ListModel {} diff --git a/QtLauncher/engine.cpp b/QtLauncher/engine.cpp index 1aadfa0..8d82259 100644 --- a/QtLauncher/engine.cpp +++ b/QtLauncher/engine.cpp @@ -5,6 +5,7 @@ #include #include +#include #define ENGINE_STATE_RUNNING QStringLiteral("running") #define ENGINE_STATE_APPLAUNCHING QStringLiteral("app-launching") @@ -57,6 +58,7 @@ void Engine::launchApplication(const QString &binary, const QString &arguments, QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); environment.insert("QT_IM_MODULE", ""); environment.insert("QT_QPA_PLATFORM", "wayland-egl"); + environment.insert("WAYLAND_DISPLAY", QStringLiteral("%1/boot2qt-democompositor").arg(QStandardPaths::writableLocation(QStandardPaths::RuntimeLocation))); for (QVariantMap::const_iterator i = env.begin(); i !=env.end(); ++i) { environment.insert(i.key(), i.value().toString()); -- cgit v1.2.3