Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
authorGunnar Sletta <gunnar@trolltech.com>
Wed, 20 Jan 2010 09:49:38 +0000 (10:49 +0100)
committerGunnar Sletta <gunnar@trolltech.com>
Wed, 20 Jan 2010 09:49:38 +0000 (10:49 +0100)
commitd7de938ee18192fbf83bb2b08519dd4ed50f04fa
tree4a3742b57fde8d7f91ea3ee830a99f027a58e2a3
parent8721d060a67a01ac891cab9d3d17aacf7373bcf0
parent92e89ade291877a1146ca3e121fba5f491f61b84
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
src/gui/image/qpixmap.cpp
src/gui/painting/qpainter.cpp
tests/auto/qpixmap/tst_qpixmap.cpp