Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integr...
authorQt Continuous Integration System <qt-info@nokia.com>
Sat, 17 Sep 2011 21:19:29 +0000 (07:19 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Sat, 17 Sep 2011 21:19:29 +0000 (07:19 +1000)
commit53d9e3620ede7492c141402d9365d5c0dd7c10fd
tree012247296bab712fcd19b92cf1a5990fd0ed2af1
parentcee22b68ed811f5b26a891d6a644613ad79aa981
parentf7a6de98e4e234833966fbe81b8ab54eba9f8429
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:
  QGraphicsWidget::setLayoutDirection doesn't propagate to new children
  Prevent unnecessary graphics item updates when graphics effect changes.
  Use more widely supported Unicode character representation
  Release font engine refcount when done using it in QTextEngine
  Fix - QGraphicsTextItem in a tab of QTabWidget cannot get focus
  Updated Changelog
  Do not put cursor at non-stop character positions
  doc: Fix incorrect enum name in QRawFont::alphaMapForGlyph docs