Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
authorBea Lam <bea.lam@nokia.com>
Tue, 23 Feb 2010 05:46:14 +0000 (15:46 +1000)
committerBea Lam <bea.lam@nokia.com>
Tue, 23 Feb 2010 06:29:52 +0000 (16:29 +1000)
commiteefe993a4241b48f14991c44baa2c074b10bc194
treea1a6ecdeb90c17707839c9c5e9cb8776ec4ff97f
parentf8eee22dcdd9b6b530c0e5c346e16552352ec03b
parente988763395625171bed001b5916d4da003d39aee
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
src/declarative/util/qmlxmllistmodel.cpp
tests/auto/declarative/qmlxmllistmodel/tst_qmlxmllistmodel.cpp