diff options
Diffstat (limited to 'src')
37 files changed, 61 insertions, 86 deletions
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt index 9050ad0c58..51d6240356 100644 --- a/src/opengl/CMakeLists.txt +++ b/src/opengl/CMakeLists.txt @@ -31,6 +31,8 @@ qt_add_module(OpenGL qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h qopenglwindow.cpp qopenglwindow.h qtopenglglobal.h + qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h + DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE @@ -92,6 +94,12 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan Vulkan::Vulkan_nolink ) +qt_extend_target(OpenGL CONDITION QT_FEATURE_egl + SOURCES + qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h + qopenglcompositor.cpp qopenglcompositor_p.h +) + qt_add_docs(OpenGL doc/qtopengl.qdocconf ) diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 37694787f3..f190616ca8 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -37,7 +37,8 @@ HEADERS += \ qopenglversionprofile.h \ qopenglvertexarrayobject.h \ qopenglwindow.h \ - qtopenglglobal.h + qtopenglglobal.h \ + qplatformbackingstoreopenglsupport.h SOURCES += \ qopengl2pexvertexarray.cpp \ @@ -61,7 +62,8 @@ SOURCES += \ qopenglversionprofile.cpp \ qopenglvertexarrayobject.cpp \ qopenglwindow.cpp \ - qopengldebug.cpp + qopengldebug.cpp \ + qplatformbackingstoreopenglsupport.cpp !qtConfig(opengles2) { HEADERS += \ @@ -139,4 +141,14 @@ qtConfig(vulkan) { QMAKE_USE += vulkan/nolink } +qtConfig(egl) { + SOURCES += \ + qopenglcompositorbackingstore.cpp \ + qopenglcompositor.cpp + + HEADERS += \ + qopenglcompositorbackingstore_p.h \ + qopenglcompositor_p.h +} + load(qt_module) diff --git a/src/platformsupport/platformcompositor/qopenglcompositor.cpp b/src/opengl/qopenglcompositor.cpp index abfaca3f9c..abfaca3f9c 100644 --- a/src/platformsupport/platformcompositor/qopenglcompositor.cpp +++ b/src/opengl/qopenglcompositor.cpp diff --git a/src/platformsupport/platformcompositor/qopenglcompositor_p.h b/src/opengl/qopenglcompositor_p.h index c9414c82c6..d0d1c9303d 100644 --- a/src/platformsupport/platformcompositor/qopenglcompositor_p.h +++ b/src/opengl/qopenglcompositor_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include <QtOpenGL/qtopenglglobal.h> + #include <QtCore/QTimer> #include <QtOpenGL/QOpenGLTextureBlitter> #include <QtGui/QMatrix4x4> @@ -72,7 +74,7 @@ public: virtual void endCompositing() { } }; -class QOpenGLCompositor : public QObject +class Q_OPENGL_EXPORT QOpenGLCompositor : public QObject { Q_OBJECT diff --git a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp b/src/opengl/qopenglcompositorbackingstore.cpp index 40400e2a19..40400e2a19 100644 --- a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp +++ b/src/opengl/qopenglcompositorbackingstore.cpp diff --git a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h b/src/opengl/qopenglcompositorbackingstore_p.h index d88738ea8f..fcce75ab4e 100644 --- a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h +++ b/src/opengl/qopenglcompositorbackingstore_p.h @@ -51,6 +51,8 @@ // We mean it. // +#include <QtOpenGL/qtopenglglobal.h> + #include <qpa/qplatformbackingstore.h> #include <QImage> #include <QRegion> @@ -60,7 +62,7 @@ QT_BEGIN_NAMESPACE class QOpenGLContext; class QPlatformTextureList; -class QOpenGLCompositorBackingStore : public QPlatformBackingStore +class Q_OPENGL_EXPORT QOpenGLCompositorBackingStore : public QPlatformBackingStore { public: QOpenGLCompositorBackingStore(QWindow *window); diff --git a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp b/src/opengl/qplatformbackingstoreopenglsupport.cpp index 511d85a400..511d85a400 100644 --- a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.cpp +++ b/src/opengl/qplatformbackingstoreopenglsupport.cpp diff --git a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.h b/src/opengl/qplatformbackingstoreopenglsupport.h index 5523b18f76..8868703deb 100644 --- a/src/platformsupport/platformcompositor/qplatformbackingstoreopenglsupport.h +++ b/src/opengl/qplatformbackingstoreopenglsupport.h @@ -51,7 +51,7 @@ #ifndef QT_NO_OPENGL -#include <QtGui/qtguiglobal.h> +#include <QtOpenGL/qtopenglglobal.h> #include <qpa/qplatformbackingstore.h> #include <QtGui/QOpenGLContext> @@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE class QOpenGLTextureBlitter; class QOpenGLBackingStore; -class QPlatformBackingStoreOpenGLSupport : public QPlatformBackingStoreOpenGLSupportBase +class Q_OPENGL_EXPORT QPlatformBackingStoreOpenGLSupport : public QPlatformBackingStoreOpenGLSupportBase { public: explicit QPlatformBackingStoreOpenGLSupport(QPlatformBackingStore *backingStore) : backingStore(backingStore) {} diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index e55937ddc8..ae75c87c97 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -19,9 +19,6 @@ endif() if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT)) add_subdirectory(services) endif() -if(QT_FEATURE_opengl) - add_subdirectory(platformcompositor) -endif() if(QT_FEATURE_egl) add_subdirectory(eglconvenience) endif() diff --git a/src/platformsupport/platformcompositor/CMakeLists.txt b/src/platformsupport/platformcompositor/CMakeLists.txt deleted file mode 100644 index 1ddc9e719d..0000000000 --- a/src/platformsupport/platformcompositor/CMakeLists.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Generated from platformcompositor.pro. - -##################################################################### -## PlatformCompositorSupport Module: -##################################################################### - -qt_add_module(PlatformCompositorSupport - STATIC - INTERNAL_MODULE - SOURCES - qopenglcompositor.cpp qopenglcompositor_p.h - qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h - qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h - DEFINES - QT_NO_CAST_FROM_ASCII - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::OpenGL -) - -#### Keys ignored in scope 1:.:.:platformcompositor.pro:<TRUE>: -# MODULE = "platformcompositor_support" diff --git a/src/platformsupport/platformcompositor/platformcompositor.pro b/src/platformsupport/platformcompositor/platformcompositor.pro deleted file mode 100644 index 89386ab3ef..0000000000 --- a/src/platformsupport/platformcompositor/platformcompositor.pro +++ /dev/null @@ -1,19 +0,0 @@ -TARGET = QtPlatformCompositorSupport -MODULE = platformcompositor_support - -QT = core-private gui-private opengl -CONFIG += static internal_module - -DEFINES += QT_NO_CAST_FROM_ASCII - -SOURCES += \ - qplatformbackingstoreopenglsupport.cpp \ - qopenglcompositor.cpp \ - qopenglcompositorbackingstore.cpp - -HEADERS += \ - qplatformbackingstoreopenglsupport.h \ - qopenglcompositor_p.h \ - qopenglcompositorbackingstore_p.h - -load(qt_module) diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index ae71ecaded..f8f37b53a2 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -19,8 +19,6 @@ qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConf if(unix:!uikit)|qtConfig(xcb): \ SUBDIRS += services -qtConfig(opengl): \ - SUBDIRS += platformcompositor qtConfig(egl): \ SUBDIRS += eglconvenience qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \ 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 |