diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-05-24 12:12:53 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-05-28 11:23:06 +0000 |
| commit | cce06a8e0ecbba8a0fe00b65ccb1a0ef6817c192 (patch) | |
| tree | a29f13deb9fed41724420dfa787e5c2e2a11880b /src/client/qwaylandintegration.cpp | |
| parent | 7659732f539bafb5fc41fc74c05c2a3f5c67ee7c (diff) | |
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 <paul.tvete@qt.io>
Diffstat (limited to 'src/client/qwaylandintegration.cpp')
| -rw-r--r-- | src/client/qwaylandintegration.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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"; |