1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move QRasterBackingStore to QtGui

Browse Source 
Task-number: QTBUG-83255
Change-Id: I339173de6e109c5a9b9572972ba894c15053c034
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-03-31 12:25:39 +02:00
parent 2f05aa82e7
commit f76161d61f
16 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/CMakeLists.txt
View File

@ -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

8
src/gui/painting/painting.pri
View File

@ -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) {

0
src/platformsupport/graphics/qrasterbackingstore.cpp → src/gui/painting/qrasterbackingstore.cpp
View File

2
src/platformsupport/graphics/qrasterbackingstore_p.h → src/gui/painting/qrasterbackingstore_p.h
View File

@ -56,7 +56,7 @@
QT_BEGIN_NAMESPACE
class QRasterBackingStore : public QPlatformBackingStore
class Q_GUI_EXPORT QRasterBackingStore : public QPlatformBackingStore
{
public:
QRasterBackingStore(QWindow *window);

3
src/platformsupport/CMakeLists.txt
View File

@ -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()

20
src/platformsupport/graphics/CMakeLists.txt
View File

@ -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"

12
src/platformsupport/graphics/graphics.pro
View File

@ -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)

5
src/platformsupport/platformsupport.pro
View File

@ -37,11 +37,6 @@ qtConfig(accessibility) {
win32:!winrt: SUBDIRS += windowsuiautomation
}
darwin {
SUBDIRS += \
graphics
}
qtConfig(vulkan): \
SUBDIRS += vkconvenience

1
src/plugins/platforms/cocoa/CMakeLists.txt
View File

@ -59,7 +59,6 @@ qt_internal_add_plugin(QCocoaIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GraphicsSupportPrivate
Qt::Gui
Qt::GuiPrivate
Qt::ThemeSupportPrivate

2
src/plugins/platforms/cocoa/cocoa.pro
View File

@ -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

2
src/plugins/platforms/cocoa/qcocoabackingstore.h
View File

@ -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>

1
src/plugins/platforms/ios/CMakeLists.txt
View File

@ -34,7 +34,6 @@ add_qt_plugin(QIOSIntegrationPlugin
Qt::Core
Qt::CorePrivate
Qt::FontDatabaseSupportPrivate
Qt::GraphicsSupportPrivate
Qt::Gui
Qt::GuiPrivate
)

2
src/plugins/platforms/ios/kernel.pro
View File

@ -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

2
src/plugins/platforms/ios/qiosbackingstore.h
View File

@ -42,7 +42,7 @@
#include <qpa/qplatformbackingstore.h>
#include <QtGraphicsSupport/private/qrasterbackingstore_p.h>
#include <QtGui/private/qrasterbackingstore_p.h>
QT_BEGIN_NAMESPACE

1
sync.profile
View File

@ -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",

3
util/cmake/helper.py
View File

@ -170,9 +170,6 @@ _qt_library_map = [
"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"]
),