From f034537ad76484a3297cd7a21f68ae65ea0aad9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Thu, 20 Aug 2015 10:00:15 +0200 Subject: [PATCH] [wayland] Drop workaround on Qt window expose event No longer needed with our own QPA plugin. --- main_wayland.cpp | 13 ------------- main_wayland.h | 2 -- 2 files changed, 15 deletions(-) diff --git a/main_wayland.cpp b/main_wayland.cpp index 4f5ee18a1e..e84c174dca 100644 --- a/main_wayland.cpp +++ b/main_wayland.cpp @@ -228,19 +228,6 @@ void ApplicationWayland::createX11Connection() setX11RootWindow(defaultScreen()->root); } -bool ApplicationWayland::notify(QObject *o, QEvent *e) -{ - if (QWindow *w = qobject_cast< QWindow* >(o)) { - if (e->type() == QEvent::Expose) { - // ensure all Wayland events both on client and server side are dispatched - // otherwise it is possible that Qt starts rendering and blocks the main gui thread - // as it waits for the callback of the last frame - waylandServer()->dispatch(); - } - } - return Application::notify(o, e); -} - void ApplicationWayland::startXwaylandServer() { int pipeFds[2]; diff --git a/main_wayland.h b/main_wayland.h index 36fb3b5e5c..23daf12927 100644 --- a/main_wayland.h +++ b/main_wayland.h @@ -48,8 +48,6 @@ public: m_environment = environment; } - bool notify(QObject *o, QEvent *e) override; - QProcessEnvironment processStartupEnvironment() const override { return m_environment; }