Merge branch '4.7' into qt-4.8-from-4.7
authorLiang Qi <liang.qi@nokia.com>
Mon, 6 Jun 2011 11:19:45 +0000 (13:19 +0200)
committerLiang Qi <liang.qi@nokia.com>
Mon, 6 Jun 2011 11:19:45 +0000 (13:19 +0200)
commit872da4c22ed2a82c7e2624b8aef8ebba6c1323d9
treecd786e093b64b8685a5d49bd48778a9650ee241f
parent1a74ca1d05c7c819db89a82de613d73244b7a980
parented2b7e6c592dcf24de2bf34a693f54b5dd569194
Merge branch '4.7' into qt-4.8-from-4.7

Conflicts:
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_ft.cpp
src/s60installs/bwins/QtGuiu.def
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/s60installs/bwins/QtGuiu.def