Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Apr 2011 06:23:42 +0000 (16:23 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Apr 2011 06:23:42 +0000 (16:23 +1000)
commitafcf63661173b78623245b4892cd282f9c7d8986
tree4997377d04e38a28952f1b7a90cae41e76971e7d
parentf08dba7fbbc53f4dcc8cc431e69c74192141eeba
parent163a4a4c38453cd4ed32c5a436763e11ce580687
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration

* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles
  Make sure removed QTextBlock is invalid
  Cocoa: Fixup wrong code in patch baaa5ae