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

Fix linkage of QtWidgets on Android

Browse Source 
On Android, the OpenGL dependency is unfortunately a public dependency
in QtGui.

Change-Id: I50847891ba55c4646078b02e3aacf14823daf1d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Simon Hausmann 2019-06-04 16:40:11 +02:00
parent 9ad193cc3d
commit c220974ed8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/CMakeLists.txt
View File

@ -380,6 +380,16 @@ extend_target(Gui CONDITION QT_FEATURE_opengl
WrapOpenGL # special case WrapOpenGL # special case
) )
# special case begin
# qopenglfunctions.h on Android does not use the function
# table indirection for calls but calls ::glFoo in inline functions
# directly. That means the GL library is a public dependency.
extend_target(Gui CONDITION QT_FEATURE_opengl AND ANDROID
PUBLIC_LIBRARIES
WrapOpenGL
)
# special case end
#### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl: #### Keys ignored in scope 2:.:.:gui.pro:QT_FEATURE_opengl:
# MODULE_CONFIG = "opengl" # MODULE_CONFIG = "opengl"