AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable EGL (and thus EGLFS) if we're not using OpenGL ES

Browse Source 
EGL support in src/platformsupport/eglconvenience requires OpenGL ES
to be enabled, so it makes no sense to test for the presence of EGL if
we're not enabling OpenGL ES.

EGLFS has similar requirements, so ensure it gets disabled
too. Otherwise we're going to get lots of undefined symbols in the
EGLFS plugin to things in QtPlatformSupport that did not get compiled
in either.

Change-Id: Ie55dd2e2597ec0594aa589ee8aac150c71104b46
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Thiago Macieira 2012-03-25 20:22:18 -03:00 committed by Qt by Nokia
parent b0b36cc53c
commit e2dfd2f4d2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -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