Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 24 Aug 2011 06:24:10 +0000 (16:24 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 24 Aug 2011 06:24:10 +0000 (16:24 +1000)
commit02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339
tree578716637feeaeffaca8908c62a7c350aeef8e22
parent9374c12ee1a21768a2e364a052b2374ce6a1ac39
parent130e906f38dfdbc5be59da3316da35a842a505de
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
  Spelling fix
  Fixed lost flushes in raster window surface.
  uikit: Use correct pixmap data format.
  Correctly position aliased lines with flat caps