Move QRasterBackingStore to QtGui

Task-number: QTBUG-83255
Change-Id: I339173de6e109c5a9b9572972ba894c15053c034
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

6 files changed, 0 insertions, 240 deletions

diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index 186b366f6a..0e589ecc86 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -40,9 +40,6 @@ endif()
 if(QT_FEATURE_accessibility AND WIN32 AND NOT WINRT)
     add_subdirectory(windowsuiautomation)
 endif()
-if(APPLE)
-    add_subdirectory(graphics)
-endif()
 if(QT_FEATURE_vulkan)
     add_subdirectory(vkconvenience)
 endif()
diff --git a/src/platformsupport/graphics/CMakeLists.txt b/src/platformsupport/graphics/CMakeLists.txt
deleted file mode 100644
index e9f0245dbe..0000000000
--- a/src/platformsupport/graphics/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated from graphics.pro.
-
-#####################################################################
-## GraphicsSupport Module:
-#####################################################################
-
-qt_add_module(GraphicsSupport
-    STATIC
-    INTERNAL_MODULE
-    SOURCES
-        qrasterbackingstore.cpp qrasterbackingstore_p.h
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-)
-
-#### Keys ignored in scope 1:.:.:graphics.pro:<TRUE>:
-# MODULE = "graphics_support"
diff --git a/src/platformsupport/graphics/graphics.pro b/src/platformsupport/graphics/graphics.pro
deleted file mode 100644
index 9886ee0332..0000000000
--- a/src/platformsupport/graphics/graphics.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TARGET = QtGraphicsSupport
-MODULE = graphics_support
-
-QT = core-private gui-private
-CONFIG += static internal_module
-
-DEFINES += QT_NO_CAST_FROM_ASCII
-
-HEADERS += $$PWD/qrasterbackingstore_p.h
-SOURCES += $$PWD/qrasterbackingstore.cpp
-
-load(qt_module)
diff --git a/src/platformsupport/graphics/qrasterbackingstore.cpp b/src/platformsupport/graphics/qrasterbackingstore.cpp
deleted file mode 100644
index a3ffe11d19..0000000000
--- a/src/platformsupport/graphics/qrasterbackingstore.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins 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$
-**
-****************************************************************************/
-
-#include "qrasterbackingstore_p.h"
-
-#include <QtGui/qbackingstore.h>
-#include <QtGui/qpainter.h>
-
-#include <private/qhighdpiscaling_p.h>
-#include <qpa/qplatformwindow.h>
-
-QT_BEGIN_NAMESPACE
-
-QRasterBackingStore::QRasterBackingStore(QWindow *window)
-    : QPlatformBackingStore(window)
-{
-}
-
-QRasterBackingStore::~QRasterBackingStore()
-{
-}
-
-void QRasterBackingStore::resize(const QSize &size, const QRegion &staticContents)
-{
-    Q_UNUSED(staticContents);
-    m_requestedSize = size;
-}
-
-QImage::Format QRasterBackingStore::format() const
-{
-    if (window()->format().hasAlpha())
-        return QImage::Format_ARGB32_Premultiplied;
-    else
-        return QImage::Format_RGB32;
-}
-
-QPaintDevice *QRasterBackingStore::paintDevice()
-{
-    return &m_image;
-}
-
-QImage QRasterBackingStore::toImage() const
-{
-    return m_image;
-}
-
-bool QRasterBackingStore::scroll(const QRegion &region, int dx, int dy)
-{
-    if (window()->surfaceType() != QSurface::RasterSurface)
-        return false;
-
-    extern void qt_scrollRectInImage(QImage &, const QRect &, const QPoint &);
-
-    const qreal devicePixelRatio = m_image.devicePixelRatio();
-    const QPoint delta(dx * devicePixelRatio, dy * devicePixelRatio);
-
-    for (const QRect &rect : region)
-        qt_scrollRectInImage(m_image, QRect(rect.topLeft() * devicePixelRatio, rect.size() * devicePixelRatio), delta);
-
-    return true;
-}
-
-void QRasterBackingStore::beginPaint(const QRegion &region)
-{
-    qreal nativeWindowDevicePixelRatio = window()->handle()->devicePixelRatio();
-    QSize effectiveBufferSize = m_requestedSize * nativeWindowDevicePixelRatio;
-    if (m_image.devicePixelRatio() != nativeWindowDevicePixelRatio || m_image.size() != effectiveBufferSize) {
-        m_image = QImage(effectiveBufferSize, format());
-        m_image.setDevicePixelRatio(nativeWindowDevicePixelRatio);
-        if (m_image.format() == QImage::Format_ARGB32_Premultiplied)
-            m_image.fill(Qt::transparent);
-    }
-
-    if (!m_image.hasAlphaChannel())
-        return;
-
-    QPainter painter(&m_image);
-    painter.setCompositionMode(QPainter::CompositionMode_Source);
-    for (const QRect &rect : region)
-        painter.fillRect(rect, Qt::transparent);
-}
-
-QT_END_NAMESPACE
diff --git a/src/platformsupport/graphics/qrasterbackingstore_p.h b/src/platformsupport/graphics/qrasterbackingstore_p.h
deleted file mode 100644
index 357e861d1d..0000000000
--- a/src/platformsupport/graphics/qrasterbackingstore_p.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui 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$
-**
-****************************************************************************/
-
-#ifndef QRASTERBACKINGSTORE_P_H
-#define QRASTERBACKINGSTORE_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qpa/qplatformbackingstore.h>
-
-
-QT_BEGIN_NAMESPACE
-
-class QRasterBackingStore : public QPlatformBackingStore
-{
-public:
-    QRasterBackingStore(QWindow *window);
-    ~QRasterBackingStore();
-
-    void resize(const QSize &size, const QRegion &staticContents) override;
-    bool scroll(const QRegion &area, int dx, int dy) override;
-    void beginPaint(const QRegion &region) override;
-
-    QPaintDevice *paintDevice() override;
-    QImage toImage() const override;
-
-protected:
-    virtual QImage::Format format() const;
-
-    QImage m_image;
-    QSize m_requestedSize;
-};
-
-QT_END_NAMESPACE
-
-#endif // QRASTERBACKINGSTORE_P_H
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index 98b92b47b1..fe3f6504fe 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -37,11 +37,6 @@ qtConfig(accessibility) {
     win32:!winrt: SUBDIRS += windowsuiautomation
 }
 
-darwin {
-    SUBDIRS += \
-        graphics
-}
-
 qtConfig(vulkan): \
     SUBDIRS += vkconvenience