Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 02:52:28 +0000 (03:52 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 25 Nov 2010 02:52:28 +0000 (03:52 +0100)
commit77d7cb79500cdb2ca277392ef5f7de79ec3e2823
tree6b86042fcc9fddd5a71cb5dc4d31600f34ee17f0
parentcb34d11e4c98e768432e00c867b3321d3b89dd9d
parentb04df748d8c170a969eb6a3097cbda7a08fb3ea1
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Document KeyEvent::modifiers