Move QRasterBackingStore to QtGui

Task-number: QTBUG-83255 Change-Id: I339173de6e109c5a9b9572972ba894c15053c034 Reviewed-by: Tor Arne Vestbø <[email protected]>
Alegriabaile · May 21, 2020 · f76161d · f76161d
1 parent 2f05aa8
commit f76161d
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 53 deletions.
diff --git 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
@@ -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/...msupport/graphics/qrasterbackingstore.cpp → src/gui/painting/qrasterbackingstore.cpp b/...msupport/graphics/qrasterbackingstore.cpp → src/gui/painting/qrasterbackingstore.cpp
diff --git a/...msupport/graphics/qrasterbackingstore_p.h → src/gui/painting/qrasterbackingstore_p.h b/...msupport/graphics/qrasterbackingstore_p.h → 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
@@ -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
diff --git a/src/platformsupport/graphics/graphics.pro b/src/platformsupport/graphics/graphics.pro
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -42,7 +42,7 @@
 
 #include <qpa/qplatformbackingstore.h>
 
-#include <QtGraphicsSupport/private/qrasterbackingstore_p.h>
+#include <QtGui/private/qrasterbackingstore_p.h>
 
 QT_BEGIN_NAMESPACE
 

diff --git a/sync.profile b/sync.profile
@@ -22,7 +22,6 @@
     "QtPlatformCompositorSupport" => "$basedir/src/platformsupport/platformcompositor",
     "QtServiceSupport" => "$basedir/src/platformsupport/services",
     "QtThemeSupport" => "$basedir/src/platformsupport/themes",
-    "QtGraphicsSupport" => "$basedir/src/platformsupport/graphics",
     "QtEglSupport" => "$basedir/src/platformsupport/eglconvenience",
     "QtFbSupport" => "$basedir/src/platformsupport/fbconvenience",
     "QtGlxSupport" => "$basedir/src/platformsupport/glxconvenience",

diff --git a/util/cmake/helper.py b/util/cmake/helper.py
@@ -170,9 +170,6 @@ def is_qt(self) -> bool:
         "global", "Qt6", "Qt::Core", extra=["COMPONENTS", "Core"]
     ),  # manually added special case
     LibraryMapping("glx_support", "Qt6", "Qt::GlxSupport", extra=["COMPONENTS", "GlxSupport"]),
-    LibraryMapping(
-        "graphics_support", "Qt6", "Qt::GraphicsSupport", extra=["COMPONENTS", "GraphicsSupport"]
-    ),
     LibraryMapping(
         "gsttools", "Qt6", "Qt::MultimediaGstTools", extra=["COMPONENTS", "MultimediaGstTools"]
     ),