Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Fix GLES2 include path for applications when not using the dash shell
This commit is contained in:
Qt Continuous Integration System 2011-05-11 23:20:45 +10:00
commit 83aa91f550

2
configure vendored
View File

@ -8438,7 +8438,7 @@ if [ -n "$QT_CFLAGS_FPU" ]; then
fi fi
if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then if [ -n "$QMAKE_INCDIR_OPENGL_ES2" ]; then
echo "\n#Qt opengl include path" >> "$QTCONFIG.tmp" echo "#Qt opengl include path" >> "$QTCONFIG.tmp"
echo "QMAKE_INCDIR_OPENGL_ES2 = \"$QMAKE_INCDIR_OPENGL_ES2\"" >> "$QTCONFIG.tmp" echo "QMAKE_INCDIR_OPENGL_ES2 = \"$QMAKE_INCDIR_OPENGL_ES2\"" >> "$QTCONFIG.tmp"
fi fi