Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7

Conflicts:
	src/gui/kernel/qt_s60_p.h

1 files changed, 1 insertions, 1 deletions

diff --git a/configure b/configure
index 326ba8867f..31437b4fb0 100755
--- a/configure
+++ b/configure
@@ -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