Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorOlivier Goffart <olivier.goffart@nokia.com>
Sat, 30 Oct 2010 13:49:41 +0000 (15:49 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Sat, 30 Oct 2010 13:49:41 +0000 (15:49 +0200)
commit5cd971bb508e1288573d32a996183f3e9359c90e
tree2617b30b5cfeeedf3b63a7c3251779766fc1276f
parente8c01ab0e5fb6134617a69d88ed0cbce24a33da5
parentab794fe3a0d2992d770c09527c479a563f21164e
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
tests/auto/qpainter/tst_qpainter.cpp
src/gui/painting/qpaintengine_raster.cpp
tests/auto/qpainter/tst_qpainter.cpp