From 316914a38b315ef479aa413b41514ddcd9738278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
Date: Mon, 6 Jul 2015 04:50:20 +0200
Subject: [PATCH] Change supported platforms of kglobalaccel plugin to
 "org.kde.kwin"

Overwrite the platform name through the environment variable and ensure
that the plugin is not picked in non-kwin Wayland sessions as that puts
kglobalaccel5 into a crash restart loop.

BUG: 349911
---
 globalshortcuts.cpp            | 1 +
 plugins/kglobalaccel/kwin.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/globalshortcuts.cpp b/globalshortcuts.cpp
index cf5d9d0997..0e0e64376a 100644
--- a/globalshortcuts.cpp
+++ b/globalshortcuts.cpp
@@ -115,6 +115,7 @@ GlobalShortcutsManager::~GlobalShortcutsManager()
 void GlobalShortcutsManager::init()
 {
     if (kwinApp()->shouldUseWaylandForCompositing()) {
+        qputenv("KGLOBALACCELD_PLATFORM", QByteArrayLiteral("org.kde.kwin"));
         m_kglobalAccel = new KGlobalAccelD(this);
         if (!m_kglobalAccel->init()) {
             qCDebug(KWIN_CORE) << "Init of kglobalaccel failed";
diff --git a/plugins/kglobalaccel/kwin.json b/plugins/kglobalaccel/kwin.json
index 25655595c8..0a2fc35aca 100644
--- a/plugins/kglobalaccel/kwin.json
+++ b/plugins/kglobalaccel/kwin.json
@@ -1,3 +1,3 @@
 {
-    "platforms": ["wayland", "wayland-egl"]
+    "platforms": ["org.kde.kwin"]
 }