diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2023-12-18 15:31:48 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@qt.io> | 2023-12-19 09:57:38 +0000 |
| commit | 68c70328ec2477badf93618b7402b59551901061 (patch) | |
| tree | 8dc49b0c5a82729c00257e24438672f814333033 | |
| parent | 9f04c802de7d077240af3dbd4734595f6a59f346 (diff) | |
Add custom socket name to be used in Demo Launcher
Change-Id: I76e58d38d8d696d3c9c939b97afb6fe54018cb40
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | QtLauncher/LauncherCompositor.qml | 2 | ||||
| -rw-r--r-- | QtLauncher/engine.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
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 <QFileInfo> #include <QDir> +#include <QStandardPaths> #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()); |