diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-04 16:40:11 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-05 08:38:44 +0000 |
| commit | c220974ed8c6c972d43f535afa7b1bbcb1ccc5e2 (patch) | |
| tree | abab7f24b36340f4ee1466d98182821d090408ff /src | |
| parent | 9ad193cc3d3379587c283a2b2cc21f7e6a4fb0cf (diff) | |
Fix linkage of QtWidgets on Android
On Android, the OpenGL dependency is unfortunately a public dependency
in QtGui.
Change-Id: I50847891ba55c4646078b02e3aacf14823daf1d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 70ce41aaca..7acfedf46b 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -380,6 +380,16 @@ extend_target(Gui CONDITION QT_FEATURE_opengl 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: # MODULE_CONFIG = "opengl" |