whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let the linker find xcb_poll_for_queued_event for us 

It's more efficient than we are. This also enables the code to work in
the unlikely case of an ELF platform without RTLD_DEFAULT.

Change-Id: Ib306f8f647014b399b87ffff13f12f8aeeb2589a
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
bb10
Thiago Macieira 2015-07-15 10:40:29 -07:00
parent 0d7af31e83
commit 3a63bb0ea7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -55,7 +55,6 @@
#include <algorithm>
#include <dlfcn.h>
#include <stdio.h>
#include <errno.h>
#include <xcb/shm.h>
@ -77,6 +76,14 @@
#include <xcb/render.h>
#endif
#if defined(Q_CC_GNU) && defined(Q_OF_ELF)
static xcb_generic_event_t *local_xcb_poll_for_queued_event(xcb_connection_t *c)
__attribute__((weakref("xcb_poll_for_queued_event")));
static inline void checkXcbPollForQueuedEvent()
{ }
#else
#include <dlfcn.h>
typedef xcb_generic_event_t * (*XcbPollForQueuedEventFunctionPointer)(xcb_connection_t *c);
static XcbPollForQueuedEventFunctionPointer local_xcb_poll_for_queued_event;
@ -85,12 +92,8 @@ static inline void checkXcbPollForQueuedEvent()
#ifdef RTLD_DEFAULT
local_xcb_poll_for_queued_event = (XcbPollForQueuedEventFunctionPointer)dlsym(RTLD_DEFAULT, "xcb_poll_for_queued_event");
#endif
#ifdef Q_XCB_DEBUG
if (local_xcb_poll_for_queued_event)
qDebug("Using threaded event reader with xcb_poll_for_queued_event");
#endif
}
#endif
QT_BEGIN_NAMESPACE