Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
authorJason McDonald <jason.mcdonald@nokia.com>
Tue, 8 Sep 2009 11:33:46 +0000 (21:33 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Tue, 8 Sep 2009 11:33:46 +0000 (21:33 +1000)
commitbc02fbf402f922b41ae6ffb5ad3ede9101456a44
tree8d35b5b13fb0fd948dc49b817ef06a907a19ed32
parentd2bbb8187688422d5104a85dc7f89215f5778f00
parent4feb4019cfc144cef4cd9177d52e52dee9ebdf32
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
src/gui/painting/qrasterizer.cpp
tests/auto/qpainter/tst_qpainter.cpp