summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2011-04-01 14:26:56 (GMT)
committerLiang Qi <liang.qi@nokia.com>2011-04-01 14:26:56 (GMT)
commit64e640716204af69056c34ddac5ce26628a1edd2 (patch)
tree9892fa344d4d24a2e8b3e352137dec5ff4ed56a0 /configure
parentb644388c82438f64566857abf84bf5d6be1238a0 (diff)
downloadQt-64e640716204af69056c34ddac5ce26628a1edd2.zip
Qt-64e640716204af69056c34ddac5ce26628a1edd2.tar.gz
Qt-64e640716204af69056c34ddac5ce26628a1edd2.tar.bz2
Add the auto detection for OpenGL in configure for makefile build system on Symbian.
Task-number: QTBUG-18485 Reviewed-by: Miikka Heikkinen Reviewed-by: axis
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 0a88c85..62eb009 100755
--- a/configure
+++ b/configure
@@ -3244,7 +3244,7 @@ if [ "$PLATFORM_QWS" = "yes" ] && [ "$CFG_OPENGL" = "auto" ]; then
fi
# mac
-if [ "$PLATFORM_MAC" = "yes" ]; then
+if [ "$PLATFORM_MAC" = "yes"] && [ "$XPLATFORM_SYMBIAN" = "no" ]; then
if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then
CFG_OPENGL=desktop
fi
@@ -5537,8 +5537,8 @@ if [ "$PLATFORM_X11" = "yes" ]; then
fi
fi
-# X11/MINGW OpenGL
-if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" ]; then
+# X11/MINGW/SYMBIAN OpenGL
+if [ "$PLATFORM_X11" = "yes" -o "$XPLATFORM_MINGW" = "yes" -o "$XPLATFORM_SYMBIAN" = "yes" ]; then
# auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es2 = OpenGL ES 2.x)
if [ "$CFG_GUI" = "no" ]; then
if [ "$CFG_OPENGL" = "auto" ]; then