Merge remote branch 'origin/4.7' into qt-4.8-from-4.7
authorJani Hautakangas <jani.hautakangas@nokia.com>
Mon, 4 Jul 2011 21:11:09 +0000 (00:11 +0300)
committerJani Hautakangas <jani.hautakangas@nokia.com>
Mon, 4 Jul 2011 21:11:09 +0000 (00:11 +0300)
commitc018f01b8a97e9ae3dee12777fd1bde4c51f231e
tree622fe32e3fde6cfa1e356a1349511749fb0870fc
parent73d7fdf686c05adaf0ea8ecddfb264b7741a2e6a
parent0a5d51aaf95524d6c5933404f0e5ab9b331d4084
Merge remote branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
doc/src/external-resources.qdoc
src/gui/text/qtextlayout.cpp
src/opengl/qwindowsurface_gl.cpp
doc/src/external-resources.qdoc
doc/src/platforms/platform-notes.qdoc
mkspecs/common/symbian/symbian.conf
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
src/gui/styles/qs60style.cpp
src/gui/styles/qs60style_p.h
src/gui/styles/qs60style_s60.cpp
src/opengl/qgl.cpp
src/opengl/qpixmapdata_symbiangl.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/s60installs.pro