Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Apr 2011 04:25:28 +0000 (14:25 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 13 Apr 2011 04:25:28 +0000 (14:25 +1000)
commita5d5971586d0a12e55374dae30e17454bca12600
tree57b58b476698398543cf197553a3315827d6b62d
parent7dc8b5e3361496064e99d1335232126788875179
parente442459e15100c2fcff0f101d8004213c2ce6960
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
  QDeclarativeDebug: Fix test case
  QDeclarativeDebug: Handle case where client with ongoing queries is deleted