1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wl_display and server_buffer_integration to the native interface

Browse Source 
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>
This commit is contained in:
Jorgen Lind 2013-12-17 15:32:02 +01:00 committed by The Qt Project
parent 151d530b44
commit 5ea6ff734b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
View File

@ -60,10 +60,12 @@ void *QWaylandNativeInterface::nativeResourceForIntegration(const QByteArray &re
{ {
QByteArray lowerCaseResource = resourceString.toLower(); QByteArray lowerCaseResource = resourceString.toLower();
if (lowerCaseResource == "display") if (lowerCaseResource == "display" || lowerCaseResource == "wl_display")
return m_integration->display()->wl_display(); return m_integration->display()->wl_display();
if (lowerCaseResource == "compositor") if (lowerCaseResource == "compositor")
return const_cast<wl_compositor *>(m_integration->display()->wl_compositor()); return const_cast<wl_compositor *>(m_integration->display()->wl_compositor());
if (lowerCaseResource == "server_buffer_integration")
return m_integration->serverBufferIntegration();
return 0; return 0;
} }