diff options
| author | Andy Shaw <andy.shaw@qt.io> | 2020-07-08 18:35:33 +0200 |
|---|---|---|
| committer | Andy Shaw <andy.shaw@qt.io> | 2020-07-09 08:01:47 +0200 |
| commit | 418901e3f84366365da4d93900e3f22c2f7aeb84 (patch) | |
| tree | 61393ba00b7704fa53796fb5f00f1c9204f47584 /src/plugins/platforms/android | |
| parent | 946fc92d20e720a82236877a378ce1c883533aa0 (diff) | |
Android: Don't depend on the OpenGL module
It is not using this for anything in the code anyway so we can just
drop it. This avoids a need to have the platform plugin depend on
OpenGL if it is configured to be on.
Change-Id: I87de162800be93db00c5022bef85c235b3655528
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/plugins/platforms/android')
4 files changed, 0 insertions, 16 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 6c73e0d40d..0a6aa6766e 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -60,11 +60,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl - PUBLIC_LIBRARIES - Qt::OpenGLPrivate -) - qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 710214f6a9..2203842fe8 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -69,12 +69,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### - -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl - PUBLIC_LIBRARIES - Qt::OpenGLPrivate -) - qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets SOURCES extract.cpp diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro index 500c6acfd1..8f4a99e0aa 100644 --- a/src/plugins/platforms/android/android.pro +++ b/src/plugins/platforms/android/android.pro @@ -6,8 +6,6 @@ QT += \ core-private gui-private \ egl_support-private -qtConfig(opengl): QT += opengl-private - OTHER_FILES += $$PWD/android.json INCLUDEPATH += \ diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index f4c292fe73..3ffbd91c6c 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -43,9 +43,6 @@ #include <QtGui/private/qguiapplication_p.h> #include <QGuiApplication> #include <QOpenGLContext> -#if QT_CONFIG(opengl) -#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> -#endif #include <QOffscreenSurface> #include <QThread> |