diff options
author | Albert Astals Cid <albert.astals@canonical.com> | 2013-11-19 16:53:21 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-27 13:14:26 +0100 |
commit | 95ffd606f8a632a8a963486ce340e7e1b707be0a (patch) | |
tree | 3ec8db71dc1ee46cc160971978989640ebd27fbb | |
parent | 1aa4ac61f980b2044069e9b89b001d5d07430ac6 (diff) |
Do not disable egl on desktop gl automatically
desktop opengl and egl are not incompatible with eachother, so there
is no need to disable egl when on desktop opengl
Task-number: QTBUG-34949
Change-Id: I757c38674a480910d1cb23853c255eb993e107ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
-rwxr-xr-x | configure | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -5267,11 +5267,13 @@ elif [ "$CFG_XKBCOMMON" = "no" ]; then fi # EGL Support -if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then +if [ "$CFG_EGL" != "no" ]; then + if [ "$CFG_EGL" = "yes" ] && [ "$CFG_OPENGL" = "no" ]; then echo "EGL support was requested but OpenGL support is disabled." - echo "Either disable EGL support or enable OpenGL ES support." + echo "Either disable EGL support or enable OpenGL support." exit 101 -elif [ "$CFG_EGL" != "no" ]; then + fi + if [ -n "$PKG_CONFIG" ] && $PKG_CONFIG --exists egl 2>/dev/null; then QMAKE_INCDIR_EGL=`$PKG_CONFIG --cflags-only-I egl 2>/dev/null | sed -e 's,^-I,,g' -e 's, -I, ,g'` QMAKE_LIBS_EGL=`$PKG_CONFIG --libs egl 2>/dev/null` |