1 files changed, 18 insertions, 51 deletions

diff --git a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
index 12ffa0ef57..df4ec592c3 100644
--- a/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
+++ b/src/quick/scenegraph/adaptations/software/qsgsoftwarerenderer.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtQuick module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qsgsoftwarerenderer_p.h"
 
@@ -92,25 +56,28 @@ void QSGSoftwareRenderer::renderScene()
 
 void QSGSoftwareRenderer::render()
 {
-    if (!m_paintDevice && !m_backingStore)
+    if (!m_paintDevice && !m_backingStore && !m_rt.paintDevice)
         return;
 
-    // If there is a backingstore, set the current paint device
-    if (m_backingStore) {
+    QPaintDevice *paintDevice = m_paintDevice ? m_paintDevice : m_rt.paintDevice;
+    QBackingStore *backingStore = nullptr;
+    // If no paint device and there is a backingstore, set the current paint device
+    if (!paintDevice && m_backingStore) {
         // For HiDPI QBackingStores, the paint device is not valid
         // until begin() has been called. See: QTBUG-55875
         m_backingStore->beginPaint(QRegion());
-        m_paintDevice = m_backingStore->paintDevice();
+        paintDevice = m_backingStore->paintDevice();
         m_backingStore->endPaint();
+        backingStore = m_backingStore;
     }
 
     QElapsedTimer renderTimer;
 
     setBackgroundColor(clearColor());
     setBackgroundRect(QRect(0, 0,
-                            m_paintDevice->width() / m_paintDevice->devicePixelRatio(),
-                            m_paintDevice->height() / m_paintDevice->devicePixelRatio()),
-                     m_paintDevice->devicePixelRatio());
+                            paintDevice->width() / paintDevice->devicePixelRatio(),
+                            paintDevice->height() / paintDevice->devicePixelRatio()),
+                      paintDevice->devicePixelRatio());
 
     // Build Renderlist
     // The renderlist is created by visiting each node in the tree and when a
@@ -135,14 +102,14 @@ void QSGSoftwareRenderer::render()
     qint64 optimizeRenderListTime = renderTimer.restart();
 
     // If Rendering to a backingstore, prepare it to be updated
-    if (m_backingStore != nullptr) {
-        m_backingStore->beginPaint(updateRegion);
+    if (backingStore != nullptr) {
+        backingStore->beginPaint(updateRegion);
         // It is possible that a QBackingStore's paintDevice() will change
         // when begin() is called.
-        m_paintDevice = m_backingStore->paintDevice();
+        paintDevice = backingStore->paintDevice();
     }
 
-    QPainter painter(m_paintDevice);
+    QPainter painter(paintDevice);
     painter.setRenderHint(QPainter::Antialiasing);
     auto rc = static_cast<QSGSoftwareRenderContext *>(context());
     QPainter *prevPainter = rc->m_activePainter;
@@ -153,8 +120,8 @@ void QSGSoftwareRenderer::render()
     qint64 renderTime = renderTimer.elapsed();
 
     painter.end();
-    if (m_backingStore != nullptr)
-        m_backingStore->endPaint();
+    if (backingStore != nullptr)
+        backingStore->endPaint();
 
     rc->m_activePainter = prevPainter;
     qCDebug(lcRenderer) << "render" << m_flushRegion << buildRenderListTime << optimizeRenderListTime << renderTime;