summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-09-16 13:55:01 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-09-16 14:02:13 (GMT)
commit0d5f6cdb1dbe67ce66b56f8cd4974a1c3199f1b2 (patch)
tree2d0778c3f94e6e085050cfafb3ec361e287723cb /configure
parent90fce5ee772b6cedb3f896adcc3d986ed7a1af57 (diff)
downloadQt-0d5f6cdb1dbe67ce66b56f8cd4974a1c3199f1b2.zip
Qt-0d5f6cdb1dbe67ce66b56f8cd4974a1c3199f1b2.tar.gz
Qt-0d5f6cdb1dbe67ce66b56f8cd4974a1c3199f1b2.tar.bz2
Make EGL a requirement for building OpenGL on QWS
Currently, QtOpenGL on QWS needs to link against an EGL library. While we'd one day like to change that, it will be that way in Qt 4.6. Reviewed-By: Paul
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 4efdde5..debd799 100755
--- a/configure
+++ b/configure
@@ -4864,9 +4864,9 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
CFG_EGL=yes
CFG_EGL_GLES_INCLUDES=yes
fi
- if ( [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ] ) && [ "$CFG_EGL" != "yes" ] && [ "$PLATFORM_X11" = "yes" ]; then
+ if ( [ "$CFG_OPENGL" = "es1" ] || [ "$CFG_OPENGL" = "es1cl" ] || [ "$CFG_OPENGL" = "es2" ] ) && [ "$CFG_EGL" != "yes" ]; then
echo "The EGL functionality test failed!"
- echo " EGL is required for OpenGL ES on X11 to manage contexts & surfaces."
+ echo " EGL is required for OpenGL ES to manage contexts & surfaces."
echo " You might need to modify the include and library search paths by editing"
echo " QMAKE_INCDIR_EGL, QMAKE_LIBDIR_EGL and QMAKE_LIBS_EGL in"
echo " ${XQMAKESPEC}."