diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-06-25 16:53:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-25 15:18:37 +0000 |
| commit | 5176ebc9ca88ff455fb47d7c8e7329bd06da7e10 (patch) | |
| tree | 90ddad2711693254a6235f39b72ae77af98e69dd /src | |
| parent | b2cb83ecbb1eec29268852d1b230f37e4c8592e9 (diff) | |
| parent | 0c0210682bdf32b0bcf0ce815d7be3df6bdab0ae (diff) | |
Merge remote-tracking branch 'origin/5.9.1' into 5.9
Change-Id: Ie585425d2d8d05c6ead283b70b88b00e1e3dc1fe
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/kernel/qwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 6112d33974..f467bcfff5 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -5860,7 +5860,7 @@ QRectF QWidgetEffectSourcePrivate::boundingRect(Qt::CoordinateSystem system) con void QWidgetEffectSourcePrivate::draw(QPainter *painter) { - if (!context || context->painter != painter || !context->sharedPainter) { + if (!context || context->painter != painter) { m_widget->render(painter); return; } |