Move QRasterBackingStore to QtGui

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

14 files changed, 16 insertions, 49 deletions

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 024f2ba0fb..2448f36e5f 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -379,6 +379,11 @@ qt_extend_target(Gui CONDITION APPLE
         ${FWCoreGraphics}
 )
 
+qt_extend_target(Gui CONDITION APPLE
+    SOURCES
+        painting/qrasterbackingstore.cpp painting/qrasterbackingstore_p.h
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_animation
     SOURCES
         animation/qguivariantanimation.cpp
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index cd4060b41d..52729d8f09 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -118,8 +118,12 @@ RESOURCES += \
         painting/qpdf.qrc \
 
 darwin {
-    HEADERS += painting/qcoregraphics_p.h
-    SOURCES += painting/qcoregraphics.mm
+    HEADERS += \
+        painting/qcoregraphics_p.h \
+        painting/qrasterbackingstore_p.h
+    SOURCES += \
+        painting/qcoregraphics.mm \
+        painting/qrasterbackingstore.cpp
 }
 
 qtConfig(cssparser) {
diff --git a/src/platformsupport/graphics/qrasterbackingstore.cpp b/src/gui/painting/qrasterbackingstore.cpp
index a3ffe11d19..a3ffe11d19 100644
--- a/src/platformsupport/graphics/qrasterbackingstore.cpp
+++ b/src/gui/painting/qrasterbackingstore.cpp
diff --git a/src/platformsupport/graphics/qrasterbackingstore_p.h b/src/gui/painting/qrasterbackingstore_p.h
index 357e861d1d..01d75c655b 100644
--- a/src/platformsupport/graphics/qrasterbackingstore_p.h
+++ b/src/gui/painting/qrasterbackingstore_p.h
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QRasterBackingStore : public QPlatformBackingStore
+class Q_GUI_EXPORT QRasterBackingStore : public QPlatformBackingStore
 {
 public:
     QRasterBackingStore(QWindow *window);
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/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
 
diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt
index a977a5af67..c79a320318 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -59,7 +59,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::FontDatabaseSupportPrivate
-        Qt::GraphicsSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
         Qt::ThemeSupportPrivate
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro
index 23cee0d7a3..2fa6b67747 100644
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@@ -97,7 +97,7 @@ DEFINES += QT_NO_FOREACH
 QT += \
     core-private gui-private \
     theme_support-private \
-    fontdatabase_support-private graphics_support-private
+    fontdatabase_support-private
 
 qtConfig(vulkan): QT += vulkan_support-private
 
diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h
index 3d9dfd8359..c29ab2d8f8 100644
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.h
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h
@@ -40,7 +40,7 @@
 #ifndef QBACKINGSTORE_COCOA_H
 #define QBACKINGSTORE_COCOA_H
 
-#include <QtGraphicsSupport/private/qrasterbackingstore_p.h>
+#include <QtGui/private/qrasterbackingstore_p.h>
 
 #include <private/qcore_mac_p.h>
 
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index caebda2a10..3e41e7e9c7 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -34,7 +34,6 @@ add_qt_plugin(QIOSIntegrationPlugin
         Qt::Core
         Qt::CorePrivate
         Qt::FontDatabaseSupportPrivate
-        Qt::GraphicsSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
 )
diff --git a/src/plugins/platforms/ios/kernel.pro b/src/plugins/platforms/ios/kernel.pro
index 0bea8f0cd9..54c46208d8 100644
--- a/src/plugins/platforms/ios/kernel.pro
+++ b/src/plugins/platforms/ios/kernel.pro
@@ -7,7 +7,7 @@ qtConfig(shared): CONFIG += static
 
 QT += \
     core-private gui-private \
-    fontdatabase_support-private graphics_support-private
+    fontdatabase_support-private
 
 qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private
 
diff --git a/src/plugins/platforms/ios/qiosbackingstore.h b/src/plugins/platforms/ios/qiosbackingstore.h
index 38006ba90b..a32a6d2eed 100644
--- a/src/plugins/platforms/ios/qiosbackingstore.h
+++ b/src/plugins/platforms/ios/qiosbackingstore.h
@@ -42,7 +42,7 @@
 
 #include <qpa/qplatformbackingstore.h>
 
-#include <QtGraphicsSupport/private/qrasterbackingstore_p.h>
+#include <QtGui/private/qrasterbackingstore_p.h>
 
 QT_BEGIN_NAMESPACE