summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2017-12-11 16:55:02 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2017-12-12 20:21:07 +0000
commit7257862fb2edfab0219d6cd45c83677049404f7d (patch)
tree72822eeada9ae1b2edc686c18142bf861f9ad780 /src/widgets
parent6a5ca7240a03cce4e490b493bb6185df019e7d87 (diff)
Set sharedPainter correctly for QGraphicsEffect
Autotest is taken from the previously reverted 8b1377fde16a2049a1c27f6d005bff84a8f85f28. Task-number: QTBUG-60231 Change-Id: I44dd79cba22b6baefdd6d95c176790bef0b7eafe Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/kernel/qwidget.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index de734b6f51..125f1cf246 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -5528,11 +5528,11 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP
setSystemClip(pdev, rgn.translated(offset));
QPainter p(pdev);
p.translate(offset);
- context.painter = &p;
+ context.painter = context.sharedPainter = &p;
graphicsEffect->draw(&p);
setSystemClip(pdev, QRegion());
} else {
- context.painter = sharedPainter;
+ context.painter = context.sharedPainter = sharedPainter;
if (sharedPainter->worldTransform() != sourced->lastEffectTransform) {
sourced->invalidateCache();
sourced->lastEffectTransform = sharedPainter->worldTransform();