Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Wed, 27 Apr 2011 09:27:52 +0000 (11:27 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Wed, 27 Apr 2011 09:27:52 +0000 (11:27 +0200)
commit896db169ea224deb96c59ce8af800d019de63f12
tree8350c36941ccfd74df35fb8a6a761edcbf042452
parent7a73de74fc517ff5722289cce4e4e754ff2417be
parentf8fea6f3b8fd3a1baa256130b23efc9e67a40e21
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/qwindowsurface_gl.cpp
src/s60installs/eabi/QtGuiu.def
doc/src/platforms/platform-notes.qdoc
src/declarative/graphicsitems/qdeclarativetextlayout.cpp
src/gui/painting/qpainter.cpp
src/gui/text/qtextcontrol.cpp
src/opengl/qwindowsurface_gl.cpp