diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2017-05-23 12:13:35 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2017-05-23 10:52:38 +0000 |
| commit | 101bd41490be160be218aa638f35cfa609267a83 (patch) | |
| tree | cd808a046a4b0521a45cabbce6c6fa6aa2201f2d /src/quickwidgets/qquickwidget.cpp | |
| parent | 16105b1b0cf9dc3849d9ff03503fa8bed1b8da40 (diff) | |
Software: Fix QQuickWidget rendering in QMdiArea
It is not safe to assume that the paintRegion is always the same as the
updateRegion reported by the software renderer, since in some cases more
needs to be flushed, such as in the case of the QMdiArea. Now we make
sure to unite both of these regions and flush everything needed.
Task-number: QTBUG-60985
Change-Id: I0408c21e42dd4107b0974877144e8e93f2c30fae
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quickwidgets/qquickwidget.cpp')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 4d021cb680..49ac0caefd 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -1596,10 +1596,10 @@ QQuickWindow *QQuickWidget::quickWindow() const void QQuickWidget::paintEvent(QPaintEvent *event) { - Q_UNUSED(event) Q_D(QQuickWidget); if (d->useSoftwareRenderer) { QPainter painter(this); + d->updateRegion = d->updateRegion.united(event->region()); if (d->updateRegion.isNull()) { //Paint everything painter.drawImage(rect(), d->softwareImage); |