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>
Wed, 5 Jan 2011 05:51:17 +0000 (15:51 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 5 Jan 2011 05:51:17 +0000 (15:51 +1000)
commit8aa9c7638080e56b124f6542699c45dfbcbba2c0
treea08bf1af2bd975cb2293793724e2bfdccf30274d
parent697e236c096d62137fdd155f5ef8d72a26b8636b
parent572598884de78c5026694843473122487269a244
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:
  Fix outdated tests