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/shellintegration | |
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/shellintegration')
-rw-r--r-- | src/client/shellintegration/qwaylandshellintegration_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/shellintegration/qwaylandshellintegration_p.h b/src/client/shellintegration/qwaylandshellintegration_p.h index 7f3a2cefc..ccad00481 100644 --- a/src/client/shellintegration/qwaylandshellintegration_p.h +++ b/src/client/shellintegration/qwaylandshellintegration_p.h @@ -79,6 +79,11 @@ public: if (oldFocus) m_display->handleWindowDeactivated(oldFocus); } + virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) { + Q_UNUSED(resource); + Q_UNUSED(window); + return nullptr; + } protected: QWaylandDisplay *m_display = nullptr; |