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>
Mon, 22 Nov 2010 08:06:21 +0000 (09:06 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 22 Nov 2010 08:06:21 +0000 (09:06 +0100)
commit9696376911ffc78b15b6a63929b0d83adfafe62e
tree2a180cc020b84f95c9ac97d2cc22ac599dbda952
parent0cfa6daa4776cd78370e644fae3005ae432b83c7
parent7c66efddd3662a3b0a43f621519e5d5a2f3c50b4
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 qml visual tests on mac.
  Doc