diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-12 11:21:56 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-04-12 11:22:16 (GMT) |
| commit | f62e846c7ebe243a2a36e7577d070f1275f2ec47 (patch) | |
| tree | 0cbfa6cd832b6f20ea699e8f172b1b3afe96b2c2 /configure | |
| parent | 6a8beac59f5824e1fc826f513495fbb8478b79ce (diff) | |
| parent | d2b05885a28aafa331b25cdf3b647b782605df08 (diff) | |
| download | Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.zip Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.gz Qt-f62e846c7ebe243a2a36e7577d070f1275f2ec47.tar.bz2 | |
Merge earth-team into origin/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 @@ -5726,8 +5726,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 |