diff options
| author | Jorgen Lind <jorgen.lind@digia.com> | 2013-12-17 15:32:02 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-27 22:37:38 +0100 |
| commit | 3cca155e1beba25648b573e4c7834ac72e61cc6c (patch) | |
| tree | 7e6b7fa4c3f9b4608607557c14bd7f5311f6ac62 | |
| parent | eb40ab5af6e85767b4dbff9fa1bf21f6ad20ad37 (diff) | |
| download | qtwayland-3cca155e1beba25648b573e4c7834ac72e61cc6c.tar.gz | |
Add wl_display and server_buffer_integration to the native interface
This is because the platform plugin name might not be wayland but we
need a way to figure out that the platform plugin has at least the
wl_display
Change-Id: I0c88f153fd71d77dc703b4e69199b1b3d19ba013
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| -rw-r--r-- | src/client/qwaylandnativeinterface.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp index 354e8dba..291f1711 100644 --- a/src/client/qwaylandnativeinterface.cpp +++ b/src/client/qwaylandnativeinterface.cpp @@ -60,10 +60,12 @@ void *QWaylandNativeInterface::nativeResourceForIntegration(const QByteArray &re { QByteArray lowerCaseResource = resourceString.toLower(); - if (lowerCaseResource == "display") + if (lowerCaseResource == "display" || lowerCaseResource == "wl_display") return m_integration->display()->wl_display(); if (lowerCaseResource == "compositor") return const_cast<wl_compositor *>(m_integration->display()->wl_compositor()); + if (lowerCaseResource == "server_buffer_integration") + return m_integration->serverBufferIntegration(); return 0; } |