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, 6 Jan 2011 05:33:51 +0000 (15:33 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Thu, 6 Jan 2011 05:33:51 +0000 (15:33 +1000)
commit97e045f48a331ff97b87bd207fb811277a4fa695
tree2afebeebcd71233f1028e66d93c918b05ad8aa77
parent8aa9c7638080e56b124f6542699c45dfbcbba2c0
parent1d7b672fd46abab51a0124ad19aad18e5d14f1a8
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:
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs