diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 10:02:12 +0200 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 10:08:59 +0200 |
commit | 3773fcb78db02a2577c89f755c07c2c7dbf0de74 (patch) | |
tree | 95115e9ccebc81ae8fdb6dfa9f8305ff9feff462 /configure | |
parent | 9f1bf75b1d55af2dda000cba580fafed2aa83838 (diff) | |
parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) |
Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7
Conflicts:
src/gui/kernel/qt_s60_p.h
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -8402,7 +8402,7 @@ if [ -n "$QT_CFLAGS_FPU" ]; then fi 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" fi |