diff options
Diffstat (limited to 'src/plugins/platforms')
25 files changed, 31 insertions, 33 deletions
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index c61d8653c7..3d61c1e959 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -76,9 +76,9 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h ) -qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 2baf04addd..80d3bdd37f 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -7,7 +7,7 @@ QT += \ eventdispatcher_support-private accessibility_support-private \ fontdatabase_support-private egl_support-private -qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private OTHER_FILES += $$PWD/android.json diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 837b1974a6..aa57cb18f9 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -44,7 +44,7 @@ #include <QGuiApplication> #include <QOpenGLContext> #if QT_CONFIG(opengl) -#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif #include <QOffscreenSurface> #include <QThread> diff --git a/src/plugins/platforms/cocoa/CMakeLists.txt b/src/plugins/platforms/cocoa/CMakeLists.txt index c4750113f1..599359b09c 100644 --- a/src/plugins/platforms/cocoa/CMakeLists.txt +++ b/src/plugins/platforms/cocoa/CMakeLists.txt @@ -111,9 +111,9 @@ qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_sessionmanager qcocoasessionmanager.cpp qcocoasessionmanager.h ) -qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(QCocoaIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(QCocoaIntegrationPlugin CONDITION TARGET Qt::Widgets diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 9bd95bbceb..eed276aed3 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -98,7 +98,7 @@ QT += \ core-private gui-private \ theme_support-private -qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private CONFIG += no_app_extension_api_only diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.mm b/src/plugins/platforms/cocoa/qcocoaintegration.mm index 27e0bb5f30..1fbe09fa9c 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.mm +++ b/src/plugins/platforms/cocoa/qcocoaintegration.mm @@ -69,7 +69,7 @@ #include <QtGui/private/qfontengine_coretext_p.h> #if QT_CONFIG(opengl) -#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif #ifdef QT_WIDGETS_LIB diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index cef9b94859..622fbe6037 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -44,9 +44,9 @@ qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate Qt::InputSupportPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp index e26d984cc1..8cf030f391 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp @@ -73,7 +73,7 @@ #include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h> #include <QtFbSupport/private/qfbvthandler_p.h> #ifndef QT_NO_OPENGL -# include <QtPlatformCompositorSupport/private/qopenglcompositorbackingstore_p.h> +# include <QtOpenGL/private/qopenglcompositorbackingstore_p.h> #endif #include <QtPlatformHeaders/QEGLNativeContext> diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp index 1d3e5ca6af..81f2e07f6b 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp @@ -43,7 +43,7 @@ #include <qpa/qwindowsysteminterface.h> #include <qpa/qplatformcursor.h> #ifndef QT_NO_OPENGL -# include <QtPlatformCompositorSupport/private/qopenglcompositor_p.h> +# include <QtOpenGL/private/qopenglcompositor_p.h> #endif #include "qeglfsscreen_p.h" diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp index f7e116eb88..e3b49f79dd 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp @@ -45,7 +45,7 @@ #ifndef QT_NO_OPENGL # include <QtGui/private/qopenglcontext_p.h> # include <QtGui/QOpenGLContext> -# include <QtPlatformCompositorSupport/private/qopenglcompositorbackingstore_p.h> +# include <QtOpenGL/private/qopenglcompositorbackingstore_p.h> #endif #include <QtEglSupport/private/qeglconvenience_p.h> diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h index 7bf74c25ee..130b87eef7 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow_p.h +++ b/src/plugins/platforms/eglfs/api/qeglfswindow_p.h @@ -57,7 +57,7 @@ #include <qpa/qplatformwindow.h> #ifndef QT_NO_OPENGL -# include <QtPlatformCompositorSupport/private/qopenglcompositor_p.h> +# include <QtOpenGL/private/qopenglcompositor_p.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index 8bb7b614f1..782ea59145 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -17,8 +17,7 @@ QT += \ qtHaveModule(input_support-private): \ QT += input_support-private -qtHaveModule(platformcompositor_support-private): \ - QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt index 0236f0d27d..6acff8b074 100644 --- a/src/plugins/platforms/ios/CMakeLists.txt +++ b/src/plugins/platforms/ios/CMakeLists.txt @@ -47,9 +47,9 @@ qt_disable_apple_app_extension_api_only(QIOSIntegrationPlugin) ## Scopes: ##################################################################### -extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate +extend_target(QIOSIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS diff --git a/src/plugins/platforms/ios/kernel.pro b/src/plugins/platforms/ios/kernel.pro index 859fa6e079..50907abbc3 100644 --- a/src/plugins/platforms/ios/kernel.pro +++ b/src/plugins/platforms/ios/kernel.pro @@ -8,7 +8,7 @@ qtConfig(shared): CONFIG += static QT += \ core-private gui-private -qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private LIBS += -framework Foundation -framework UIKit -framework QuartzCore -framework AudioToolbox diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 3b01342b8e..8b68c83eef 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -67,7 +67,7 @@ #import <AudioToolbox/AudioServices.h> #if QT_CONFIG(opengl) -#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif #include <QtDebug> diff --git a/src/plugins/platforms/wasm/qwasmintegration.cpp b/src/plugins/platforms/wasm/qwasmintegration.cpp index 37cc6185c5..fd76f64dc9 100644 --- a/src/plugins/platforms/wasm/qwasmintegration.cpp +++ b/src/plugins/platforms/wasm/qwasmintegration.cpp @@ -41,7 +41,7 @@ #include "qwasmwindow.h" #ifndef QT_NO_OPENGL # include "qwasmbackingstore.h" -# include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +# include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif #include "qwasmfontdatabase.h" #if defined(Q_OS_UNIX) diff --git a/src/plugins/platforms/wasm/wasm.pro b/src/plugins/platforms/wasm/wasm.pro index 1aee4a3e58..0eefe90163 100644 --- a/src/plugins/platforms/wasm/wasm.pro +++ b/src/plugins/platforms/wasm/wasm.pro @@ -4,7 +4,7 @@ QT += \ core-private gui-private \ eventdispatcher_support-private fontdatabase_support-private egl_support-private -qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index c79a5a335b..cb79a5d9d0 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -86,9 +86,9 @@ qt_add_resource(QWindowsIntegrationPlugin "openglblacklists" ## Scopes: ##################################################################### -qt_extend_target(QWindowsIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility diff --git a/src/plugins/platforms/windows/qwindowsgdiintegration.cpp b/src/plugins/platforms/windows/qwindowsgdiintegration.cpp index 7e9595321a..3b25840e16 100644 --- a/src/plugins/platforms/windows/qwindowsgdiintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsgdiintegration.cpp @@ -46,7 +46,7 @@ #include <QtGui/private/qpixmap_raster_p.h> #if QT_CONFIG(opengl) -#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index ff5201e290..d311744675 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -5,7 +5,7 @@ QT += \ eventdispatcher_support-private \ fontdatabase_support-private theme_support-private -qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private qtConfig(accessibility): QT += accessibility_support-private diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp index f7d44c6f28..0f76d7d65b 100644 --- a/src/plugins/platforms/winrt/qwinrtintegration.cpp +++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp @@ -54,7 +54,7 @@ # include "uiautomation/qwinrtuiaaccessibility.h" #endif #if QT_CONFIG(opengl) -#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif #include <QtGui/QOffscreenSurface> diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro index 7ac49f73c4..3d9f9a36d1 100644 --- a/src/plugins/platforms/winrt/winrt.pro +++ b/src/plugins/platforms/winrt/winrt.pro @@ -6,7 +6,7 @@ QT += \ core-private gui-private \ fontdatabase_support-private egl_support-private -qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__ diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 1d481832f1..6e4388cc3f 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -71,9 +71,9 @@ qt_disable_apple_app_extension_api_only(XcbQpa) ## Scopes: ##################################################################### -qt_extend_target(XcbQpa CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(XcbQpa CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp index cea0511822..986ba862e5 100644 --- a/src/plugins/platforms/xcb/qxcbintegration.cpp +++ b/src/plugins/platforms/xcb/qxcbintegration.cpp @@ -62,7 +62,7 @@ #include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h> #include <QtServiceSupport/private/qgenericunixservices_p.h> #if QT_CONFIG(opengl) -#include <QtPlatformCompositorSupport/qpa/qplatformbackingstoreopenglsupport.h> +#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #endif #include <stdio.h> diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 8154d300b1..eced76ec31 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -9,8 +9,7 @@ QT += \ edid_support-private \ xkbcommon_support-private -qtHaveModule(platformcompositor_support-private): \ - QT += platformcompositor_support-private +qtConfig(opengl): QT += opengl-private qtHaveModule(linuxaccessibility_support-private): \ QT += linuxaccessibility_support-private |