package/qt: Fix Kconfig for OpenGL support

BR2_PACKAGE_QT_OPENGL_ES was moved to a choice option. This option kind
can apparently not be selected by other packages. Therefore this patch
introduces a new Kconfig option BR2_PACKAGE_QT_OPENGL which takes care
of OpenGL support as such, BR2_PACKAGE_QT_OPENGL_NONE is not needed
anymore now. The choice options are now only used to determine the
type of OpenGL support.

This patch contains the necessary preparation to fix a build error in
the qwt package.

[Peter: fix QT_OPENGL dependencies to match options]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 14b13cec20a451861346fbd0d3519dd1ed6875e1..91eb2084756d7b7cb6bd3bb1eaf725dbf70afa8e 100644 (file)
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -350,14 +350,20 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
          Build the platform Phonon plugin.
          If unsure, say n.
 
+config BR2_PACKAGE_QT_OPENGL
+       bool "OpenGL support"
+       depends on (BR2_PACKAGE_HAS_LIBGL && BR2_PACKAGE_QT_X11) || \
+                  (BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES)
+       help
+         This option enables OpenGL support.
+
+if BR2_PACKAGE_QT_OPENGL
+
 choice
        prompt "OpenGL API"
        help
          Select OpenGL API.
 
-config BR2_PACKAGE_QT_OPENGL_NONE
-       bool "No OpenGL support"
-
 comment "Desktop OpenGL not available (needs Qt standard (X11))"
        depends on !BR2_PACKAGE_QT_X11
 
@@ -377,6 +383,8 @@ config BR2_PACKAGE_QT_OPENGL_ES
 
 endchoice
 
+endif # BR2_PACKAGE_QT_OPENGL
+
 endif
 
 config BR2_PACKAGE_QT_DBUS