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>
Tue, 12 Apr 2011 17:37:40 +0000 (03:37 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 12 Apr 2011 17:37:40 +0000 (03:37 +1000)
commit209c674c8b5012b6b6b42be90e5bd2bfe5fa38f8
treeccf18da6b99486c38d5182c25f5da80e6974b144
parentc72928c26118a3aa6491dba523da0594de8b48ba
parentc17150344510fc5fe239e39e6659bd16579586e8
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:
  ListView has wrong keyPressEvent behaviour when vertical
  Ensure view is positioned correctly when orientation changes.
  Fix regression in wigglytext.qml
src/declarative/qml/qdeclarativecomponent.cpp