From bff59f87ba11cac1dfa710f021522372de7a776f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 22 Mar 2018 12:54:35 +0100 Subject: Move delivery of update requests into QPlatformWindow Having deliverUpdateRequest in QWindowPrivate was a bit awkward and asymmetric to the QPlatformWindow::requestUpdate() API. Keeping them together follows the existing pattern of plumbing things through the platform window, and also allows us to move away from platform plugins relying on QWindowPrivate implementation details. Change-Id: Ib131ccdd1c2bdd6ff1c8d95facbc3f6f88a1abcf Reviewed-by: Simon Hausmann --- src/gui/kernel/qwindow.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/gui/kernel/qwindow.cpp') diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index da22d237ac..0a41196b5b 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -2333,7 +2333,8 @@ bool QWindow::event(QEvent *ev) if (static_cast(ev)->timerId() == d->updateTimer) { killTimer(d->updateTimer); d->updateTimer = 0; - d->deliverUpdateRequest(); + if (d->platformWindow) + d->platformWindow->deliverUpdateRequest(); } else { QObject::event(ev); } @@ -2357,14 +2358,6 @@ bool QWindow::event(QEvent *ev) return true; } -void QWindowPrivate::deliverUpdateRequest() -{ - Q_Q(QWindow); - updateRequestPending = false; - QEvent request(QEvent::UpdateRequest); - QCoreApplication::sendEvent(q, &request); -} - /*! Schedules a QEvent::UpdateRequest event to be delivered to this window. -- cgit v1.2.3