diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:39 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-21 20:28:37 +0200 |
| commit | f76161d61f14428a1dc2bd6024a523ebe46fdfea (patch) | |
| tree | ff2e638f8d1f11880beedd219e7054ea218f2204 /src/plugins | |
| parent | 2f05aa82e792089a249a0a77f1ae7e055cc90208 (diff) | |
Move QRasterBackingStore to QtGui
Task-number: QTBUG-83255
Change-Id: I339173de6e109c5a9b9572972ba894c15053c034
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/cocoa/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoabackingstore.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/kernel.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosbackingstore.h | 2 |
6 files changed, 4 insertions, 6 deletions
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 |