Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Dec 2011 09:09:10 +0000 (19:09 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 9 Dec 2011 09:09:10 +0000 (19:09 +1000)
commit5aa3363f939278067eac223c4c3d34f820f52318
tree090c7d91e29afe59f6e2af02d0f9c5e166bd920d
parent912e7eec85d655f579796b8d930ae5c5f29cffe0
parentca6db4b5b89f627a970e9f4ea489eae38d771f66
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:
  Fix stretched font positions in Lion
  Backport writingSystems support code for Cocoa from Qt 5