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 02:35:28 +0000 (12:35 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Tue, 12 Apr 2011 02:35:28 +0000 (12:35 +1000)
commitb6f1dd4151c5bbcb7d4367ec972c9026ab9e68be
treeb9c4adba9bf64a3f8f62d1b1299f5083f3896ea2
parent4889729b32b30a4bad90a0add8ca444529dea2e7
parentf2219ce983098fc14655d8f3bb8a7fee2c9abe4d
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:
  Allow enum values to be used as signal parameters
  ListModel::clear() should not clear roles
doc/src/declarative/qtbinding.qdoc
src/declarative/util/qdeclarativelistmodel.cpp