diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-05-08 16:31:16 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-05-09 11:04:35 +0000 |
| commit | f11c2993d2173d97ab74a36cac5603dff1c32997 (patch) | |
| tree | 81e76f6dbbe94dbeb7bddbbde09bb31f6d6b85f2 /src/client/client.pro | |
| parent | 7344822dd3991fa4b914531d7e2a42b1c05c1e9d (diff) | |
Move xdg-shell-v5 to a plugin
This is the first step in deprecating xdg-shell unstable v5 and making the good
names available for the good names for xdg-shell stable.
Shell initialization has been refactored slightly, so the
QWaylandShellIntegrationFactory actually tries to initialize the shell
integration before returning it. Similarly for the factory method of non-plugin
shells.
Change-Id: I85e60594c4fc03c6f302c04316110aed428d28dc
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/client/client.pro')
| -rw-r--r-- | src/client/client.pro | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index eae7ad52e..1bcd6780c 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -28,7 +28,6 @@ WAYLANDCLIENTSOURCES += \ ../extensions/qtkey-extension.xml \ ../extensions/qt-windowmanager.xml \ ../3rdparty/protocol/text-input-unstable-v2.xml \ - ../3rdparty/protocol/xdg-shell.xml \ ../3rdparty/protocol/xdg-shell-unstable-v6.xml \ WAYLANDCLIENTSOURCES_SYSTEM += \ @@ -45,10 +44,6 @@ SOURCES += qwaylandintegration.cpp \ qwaylandshellsurface.cpp \ qwaylandwlshellsurface.cpp \ qwaylandwlshellintegration.cpp \ - qwaylandxdgshell.cpp \ - qwaylandxdgsurface.cpp \ - qwaylandxdgpopup.cpp \ - qwaylandxdgshellintegration.cpp \ qwaylandxdgshellv6.cpp \ qwaylandxdgshellv6integration.cpp \ qwaylandextendedsurface.cpp \ @@ -78,10 +73,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylandshellsurface_p.h \ qwaylandwlshellsurface_p.h \ qwaylandwlshellintegration_p.h \ - qwaylandxdgshell_p.h \ - qwaylandxdgsurface_p.h \ - qwaylandxdgpopup_p.h \ - qwaylandxdgshellintegration_p.h \ qwaylandxdgshellv6_p.h \ qwaylandxdgshellv6integration_p.h \ qwaylandextendedsurface_p.h \ |