diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 15:27:11 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-28 21:39:48 +0200 |
| commit | 7172b5112e5dbf0cb63dec68d2f916a323748aa1 (patch) | |
| tree | 2f3b4078252ff314afe7ae61342c41fe1d3f4030 /src/plugins/platforms/ios | |
| parent | d80a98d52548b1081ba3f980252fe9aee89bc1f8 (diff) | |
Move QtPlatformCompositorSupport into QtOpenGL
Task-number: QTBUG-83255
Change-Id: Id9ea654db8efb00b487d53aea03d7f23a7ab1a54
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios')
| -rw-r--r-- | src/plugins/platforms/ios/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/kernel.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/ios/qiosintegration.mm | 2 |
3 files changed, 4 insertions, 4 deletions
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> |