Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 17:05:58 +0000 (03:05 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Fri, 7 Jan 2011 17:05:58 +0000 (03:05 +1000)
commit8acb9028787c75682055afe2a5b494c78b8f944d
tree2394fec9c2aa547c91367fe031a1a0902eb44787
parent5c8238d425a66072c8048a8c13f5bb0a1fbceac2
parentba8c96ee48cbad70f83919c4dcfc133566442bea
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Fix crash when closing QFontDialog::getFont() dialog
  Fix timer warning when deleting item views
  Remove support for automatic tactile feedback from QS60Style
  Remove warning about null cursor handle on S60 while handle is valid