diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:47:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 12:24:42 +0200 |
| commit | 6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (patch) | |
| tree | dd3dd688eabf504913df465bb1a384521fcafda4 /src/client/qwaylandnativeinterface.cpp | |
| parent | 87499ddd653fb20796c2dd2eabac37b45240ef1c (diff) | |
| parent | 3dc9cfdbd2771c28c770d432b99e571db43fe599 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f
Diffstat (limited to 'src/client/qwaylandnativeinterface.cpp')
| -rw-r--r-- | src/client/qwaylandnativeinterface.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp index 8170c39f1..0d20075f0 100644 --- a/src/client/qwaylandnativeinterface.cpp +++ b/src/client/qwaylandnativeinterface.cpp @@ -58,8 +58,6 @@ void *QWaylandNativeInterface::nativeResourceForIntegration(const QByteArray &re if (lowerCaseResource == "display" || lowerCaseResource == "wl_display" || lowerCaseResource == "nativedisplay") return m_integration->display()->wl_display(); - if (lowerCaseResource == "wl_event_queue") - return m_integration->display()->wl_event_queue(); if (lowerCaseResource == "compositor") return const_cast<wl_compositor *>(m_integration->display()->wl_compositor()); if (lowerCaseResource == "server_buffer_integration") |