Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr... v4.8.0-rc1
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 3 Oct 2011 15:05:20 +0000 (01:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 3 Oct 2011 15:05:20 +0000 (01:05 +1000)
commit92f06c223ba2457e74944a786bed629bdf00ca4b
tree4425b55e5d7ee6255e6c17489c6c9bc3dd425613
parent06c23ac8a6d03af3b9674c8c7850560a0973b2fb
parent83bf60ee19bb7c0815549aec5dcc8f4190301cc5
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 possible crash in QFontEngineFT