diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-14 11:32:46 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-04-14 11:32:46 (GMT) |
| commit | 5c4fb96fdeaf3f15e2cf31fd9970fdcfab2a8024 (patch) | |
| tree | 7db123f1fac79083c96943a743ec9b491ecc8db0 /configure | |
| parent | 94117641f97d180e0452c508fd4743bf29fb53a7 (diff) | |
| parent | 662174b78b7e08c759d0086e215e81e9e0eaf0c5 (diff) | |
| download | Qt-5c4fb96fdeaf3f15e2cf31fd9970fdcfab2a8024.zip Qt-5c4fb96fdeaf3f15e2cf31fd9970fdcfab2a8024.tar.gz Qt-5c4fb96fdeaf3f15e2cf31fd9970fdcfab2a8024.tar.bz2 | |
Merge remote-tracking branch 'mainline/master'
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -3416,7 +3416,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 @@ -5725,8 +5725,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 |