From 0f489c3521eb5f19459b4210911548237e0655b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Fl=C3=B6ser?= <mgraesslin@kde.org>
Date: Fri, 4 Jan 2019 18:38:47 +0100
Subject: [PATCH] [platforms/x11/standalone] Pass kxkbconfig to Xkb prior to
 reconfigure

Summary:
This ensures that KWin gets the same keyboard layout config as is
configured in the session and not a default config.

BUG: 402764
FIXED-IN: 5.14.5

Test Plan:
Xephyr to verify the config is applied, otherwise completely
untested. I don't have an X session.

Reviewers: #kwin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D17967
---
 plugins/platforms/x11/standalone/x11_platform.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp
index 7439ed246f..e7b5fba2f0 100644
--- a/plugins/platforms/x11/standalone/x11_platform.cpp
+++ b/plugins/platforms/x11/standalone/x11_platform.cpp
@@ -146,6 +146,7 @@ void X11StandalonePlatform::createPlatformCursor(QObject *parent)
         m_xinputIntegration->setCursor(c);
         // we know we have xkb already
         auto xkb = input()->keyboard()->xkb();
+        xkb->setConfig(kwinApp()->kxkbConfig());
         xkb->reconfigure();
     }
 #endif