diff options
-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())); |