Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
authorQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Feb 2010 17:32:37 +0000 (18:32 +0100)
committerQt Continuous Integration System <qt-info@nokia.com>
Wed, 17 Feb 2010 17:32:37 +0000 (18:32 +0100)
commit720d56486c3a3fd2d4d6517b8805ff96d3c6da60
tree053c3b12347554bc22d502a554ca7c47a799c392
parent340b44156245a520e53119815670becd3eb7fb70
parent9531f924478d78f0a679305cd2e5f1b4c4dd849e
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Remove unusable test case from QGraphicsItem benchmark.
  Remove unstable test case from QGraphicsItem::setTransform benchmark.
  Stabilize QGraphicsItem benchmarks.