diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-06 02:38:43 (GMT) |
|---|---|---|
| committer | Kurt Korbatits <kurt.korbatits@nokia.com> | 2010-04-06 02:38:43 (GMT) |
| commit | bc190d195a20d5e87547e27265df2ce9668ab545 (patch) | |
| tree | a7e30c346edde209332fb341bb381a495bf3af31 | |
| parent | 1f6d3c9cddaf1e44ae9f0a18e9df5d4affe3f8b2 (diff) | |
| parent | ff8f6b0e5f76e4d4b1612a80325d6f66c825597f (diff) | |
| download | Qt-bc190d195a20d5e87547e27265df2ce9668ab545.zip Qt-bc190d195a20d5e87547e27265df2ce9668ab545.tar.gz Qt-bc190d195a20d5e87547e27265df2ce9668ab545.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
| -rw-r--r-- | tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index 7fdd9c9..bec4950 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -6901,7 +6901,7 @@ void tst_QGraphicsItem::cacheMode() // because the parent is rotated with a perspective. testerChild->setPos(1, 1); QTest::qWait(25); - QTRY_COMPARE(tester->repaints, 10); + QTRY_COMPARE(tester->repaints, 11); QTRY_COMPARE(testerChild->repaints, 10); QTRY_COMPARE(testerChild2->repaints, 5); tester->resetTransform(); |