Commit ea33a38f authored by David Edmundson's avatar David Edmundson
Browse files

Exclude the kwin process when checking if we are in wayland

Kwin does not speak wayland to itself. Recent changes make use of
QWaylandClientExtension that understandably assumes the wayland QPA is
in use.

Kwin's QPA name "wayland-org.kde.kwin.qpa" matches the check
KWindowSystem::isPlatformWayland() which internally does
platformName.startsWith("wayland")

We have no reason to sync application colour schemes or appmenu bars to
kwin from inside the QPT, so we can just tighten our check for which QPA
is in use.
parent 9e519bea
Pipeline #154061 passed with stage
in 1 minute and 4 seconds
......@@ -61,7 +61,8 @@ KdePlatformTheme::KdePlatformTheme()
{
loadSettings();
if (KWindowSystem::isPlatformWayland()) {
// explicitly not KWindowSystem::isPlatformWayland to not include the kwin process
if (QGuiApplication::platformName() == QLatin1String("wayland")) {
m_kwaylandIntegration.reset(new KWaylandIntegration());
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment