diff options
| author | Andy Nichols <andy.nichols@digia.com> | 2012-12-03 17:15:03 +0100 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@digia.com> | 2013-01-07 15:57:34 +0100 |
| commit | 25ae573c308c58d8af1467d27233a4dee91298c4 (patch) | |
| tree | 2c4abf1142ecb8242068d2b0ab494c33025cb95d /src | |
| parent | 819d3b1f159d34116fb27f00468371410322c1c8 (diff) | |
Remove WAYLAND_CLIENT_THREAD_AFFINITY logic
This was a define added by a wayland patch that was not accepted
upstream. This should no longer be needed, and the patch has been
removed from our codebase.
Change-Id: I6c823a5e9771ea29c640d27fd2de2a42982ed7b8
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.cpp | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp index 881dbcc0d..b0a426704 100644 --- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp +++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp @@ -83,11 +83,7 @@ void QWaylandEglIntegration::initialize() bool QWaylandEglIntegration::supportsThreadedOpenGL() const { -#ifdef WAYLAND_CLIENT_THREAD_AFFINITY - return true; -#else return false; -#endif } QWaylandWindow *QWaylandEglIntegration::createEglWindow(QWindow *window) diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp index 44c1cd0b5..7964f4cb5 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp +++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp @@ -133,15 +133,9 @@ QWaylandDisplay::QWaylandDisplay(void) mRegistry = wl_display_get_registry(mDisplay); wl_registry_add_listener(mRegistry, ®istryListener, this); -#ifdef WAYLAND_CLIENT_THREAD_AFFINITY - mWritableNotificationFd = wl_display_get_write_notification_fd(mDisplay); - QSocketNotifier *wn = new QSocketNotifier(mWritableNotificationFd, QSocketNotifier::Read, this); - connect(wn, SIGNAL(activated(int)), this, SLOT(flushRequests())); -#else QAbstractEventDispatcher *dispatcher = QGuiApplicationPrivate::eventDispatcher; connect(dispatcher, SIGNAL(awake()), this, SLOT(flushRequests())); // needed for auto-testing connect(dispatcher, SIGNAL(aboutToBlock()), this, SLOT(flushRequests())); -#endif mReadNotifier = new QSocketNotifier(mFd, QSocketNotifier::Read, this); connect(mReadNotifier, SIGNAL(activated(int)), this, SLOT(readEvents())); |