From 978ee4e60e2e1694ac46512072b1330dd2f69031 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Wed, 18 Mar 2015 10:46:52 +0200 Subject: [PATCH] QWidget: Update systemClip restore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change in QWidget::render method to update QPaintEnginePrivate’s systemClip order so it won’t be updated in method setSystemTransform. Task-number: QTBUG-44067 Change-Id: I9fe13c019682c99d035649b71e63b107affb3b91 Reviewed-by: Friedemann Kleint Reviewed-by: Frederik Gladhorn --- src/widgets/kernel/qwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 66ded4cb5f..f9a9fe2d0c 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5153,9 +5153,9 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset, d->render(target, targetOffset, toBePainted, renderFlags); // Restore system clip, viewport and transform. - enginePriv->systemClip = oldSystemClip; enginePriv->setSystemViewport(oldSystemViewport); enginePriv->setSystemTransform(oldTransform); + enginePriv->systemClip = oldSystemClip; // Restore shared painter. d->setSharedPainter(oldPainter);