Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 14:59:56 +0000 (00:59 +1000)
committerQt Continuous Integration System <qt-info@nokia.com>
Mon, 16 May 2011 14:59:56 +0000 (00:59 +1000)
commit219175903f9722bee12271321614cdaeb88eb914
tree8451797482725dc11d351667e0945de2e57644f2
parent7e4a9187bb11b794e45d95d2e9fae026d6b0d07d
parent4f7af4c544c3b793ba8cccb28e5c856f3d754e4a
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Revert all QScroller and QFlickGesture related code.
  Fix regression that caused waitForXXX(-1) to fail.