diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-05-09 22:57:53 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-05-18 09:37:07 +0000 |
| commit | 42f71e680c6146526fb18116b1b98995543443c0 (patch) | |
| tree | 465f50e000788cd699f7cbf3425c9404abea4712 /src/client/qwaylandintegration.cpp | |
| parent | 9ac2cdf96d36db9612effdbdb9669bd413b66b84 (diff) | |
Move wl-shell to a plugin
[ChangeLog][QPA plugin] The wl-shell shell integration has been moved to a
plugin.
This also adds API so shell integrations can return native resources for
windows, as it was needed in order to continue to supporting wl_shell_surface.
Change-Id: Ibc68ffcc5b0c6993d8f4e078f663e4d67340e1a5
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 2a169aca6..fbfdd57f4 100644 --- a/src/client/qwaylandintegration.cpp +++ b/src/client/qwaylandintegration.cpp @@ -77,7 +77,6 @@ #include "qwaylandshellintegration_p.h" #include "qwaylandshellintegrationfactory_p.h" -#include "qwaylandwlshellintegration_p.h" #include "qwaylandxdgshellv6integration_p.h" #include "qwaylandinputdeviceintegration_p.h" @@ -442,9 +441,7 @@ void QWaylandIntegration::initializeInputDeviceIntegration() QWaylandShellIntegration *QWaylandIntegration::createShellIntegration(const QString &integrationName) { - if (integrationName == QLatin1Literal("wl-shell")) { - return QWaylandWlShellIntegration::create(mDisplay.data()); - } else if (integrationName == QLatin1Literal("xdg-shell-v6")) { + if (integrationName == QLatin1Literal("xdg-shell-v6")) { return QWaylandXdgShellV6Integration::create(mDisplay.data()); } else if (QWaylandShellIntegrationFactory::keys().contains(integrationName)) { return QWaylandShellIntegrationFactory::create(integrationName, mDisplay.data()); |