Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 27 Oct 2010 11:01:42 +0000 (13:01 +0200)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 27 Oct 2010 11:01:42 +0000 (13:01 +0200)
commitab794fe3a0d2992d770c09527c479a563f21164e
treecc576561b9109121c55a5e79af22cc8b66bc30a5
parente5ef6f580e1b601898a2fea095ed5be9823bab25
parent4d0571667463997f5f1145408a2ba73ba293637a
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix Windows compilation.
  Fixed race condition in raster paint engine.