Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
authorOlivier Goffart <olivier.goffart@nokia.com>
Mon, 2 May 2011 12:20:42 +0000 (14:20 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Mon, 2 May 2011 12:20:42 +0000 (14:20 +0200)
commit8abaeb826c5fdb5bb872b27b3f411e63d63a12ff
treeca002b2327fbd8dd60220198c78173740a550550
parentab29e9f1ab52901a5ed98055cf203817d2248dd2
parent43503e38d91c0e8375c2d5993de201419ba854ec
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7

Conflicts:
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
src/activeqt/shared/qaxtypes.cpp
src/gui/painting/qtextureglyphcache.cpp
src/openvg/qpaintengine_vg.cpp
src/openvg/qpixmapdata_vg.cpp
tests/auto/qpixmap/tst_qpixmap.cpp