From cce06a8e0ecbba8a0fe00b65ccb1a0ef6817c192 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Thu, 24 May 2018 12:12:53 +0200 Subject: Client: Move xdg-shell-v6 to a plugin [ChangeLog][QPA plugin] The xdg-shell-v6 shell integration has been moved to a plugin. Change-Id: I548d19590ddbc8ad3e791301359a6de17ac9dcd8 Reviewed-by: Paul Olav Tvete --- src/client/qwaylandintegration.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/client/qwaylandintegration.cpp') diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp index fbfdd57f4..6ab5f0f20 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -77,7 +77,6 @@ #include "qwaylandshellintegration_p.h" #include "qwaylandshellintegrationfactory_p.h" -#include "qwaylandxdgshellv6integration_p.h" #include "qwaylandinputdeviceintegration_p.h" #include "qwaylandinputdeviceintegrationfactory_p.h" @@ -441,9 +440,7 @@ void QWaylandIntegration::initializeInputDeviceIntegration() QWaylandShellIntegration *QWaylandIntegration::createShellIntegration(const QString &integrationName) { - if (integrationName == QLatin1Literal("xdg-shell-v6")) { - return QWaylandXdgShellV6Integration::create(mDisplay.data()); - } else if (QWaylandShellIntegrationFactory::keys().contains(integrationName)) { + if (QWaylandShellIntegrationFactory::keys().contains(integrationName)) { return QWaylandShellIntegrationFactory::create(integrationName, mDisplay.data()); } else { qCWarning(lcQpaWayland) << "No shell integration named" << integrationName << "found"; -- cgit v1.2.3