1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Don't depend on the OpenGL module

Browse Source 
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>
This commit is contained in:
Andy Shaw 2020-07-08 18:35:33 +02:00
parent 946fc92d20
commit 418901e3f8
4 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/android/.prev_CMakeLists.txt
View File

@ -60,11 +60,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl
PUBLIC_LIBRARIES
Qt::OpenGLPrivate
)
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
SOURCES SOURCES
extract.cpp extract.cpp

6
src/plugins/platforms/android/CMakeLists.txt
View File

@ -69,12 +69,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl
PUBLIC_LIBRARIES
Qt::OpenGLPrivate
)
qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets
SOURCES SOURCES
extract.cpp extract.cpp

2
src/plugins/platforms/android/android.pro
View File

@ -6,8 +6,6 @@ QT += \
core-private gui-private \ core-private gui-private \
egl_support-private egl_support-private
qtConfig(opengl): QT += opengl-private
OTHER_FILES += $$PWD/android.json OTHER_FILES += $$PWD/android.json
INCLUDEPATH += \ INCLUDEPATH += \

3
src/plugins/platforms/android/qandroidplatformintegration.cpp
View File

@ -43,9 +43,6 @@
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
#include <QGuiApplication> #include <QGuiApplication>
#include <QOpenGLContext> #include <QOpenGLContext>
#if QT_CONFIG(opengl)
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
#endif
#include <QOffscreenSurface> #include <QOffscreenSurface>
#include <QThread> #include <QThread>