From c220974ed8c6c972d43f535afa7b1bbcb1ccc5e2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 4 Jun 2019 16:40:11 +0200 Subject: 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 --- src/gui/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) 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" -- cgit v1.2.3