diff options
-rwxr-xr-x | configure | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -4584,7 +4584,7 @@ else fi # EGL Support -if [ "$CFG_EGL" != "no" ]; then +if [ "$CFG_EGL" != "no" ] && [ "$CFG_OPENGL" != "desktop" ]; then 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` @@ -4602,6 +4602,13 @@ if [ "$CFG_EGL" != "no" ]; then else CFG_EGL=no fi +elif [ "$CFG_OPENGL" = "desktop" ]; then + if [ "$CFG_EGL" = "yes" ]; then + echo "EGL support was requested but Qt is being configured for desktop OpenGL." + echo "Either disable EGL support or enable OpenGL ES support." + exit 101 + fi + CFG_EGL=no fi if [ "$CFG_EGLFS" != "no" ]; then |