diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-12-11 14:39:29 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-12-11 14:39:29 (GMT) |
| commit | 9e5c5e2c68f3aefd60571551664936465dd04913 (patch) | |
| tree | b58901160ac2adf4269a1c2ee719d626e112f582 /tests | |
| parent | 0fecf4184e888b202766210b235fde09a81c5257 (diff) | |
| parent | d8b7b7278987462791488f756edd26842d059074 (diff) | |
| download | Qt-9e5c5e2c68f3aefd60571551664936465dd04913.zip Qt-9e5c5e2c68f3aefd60571551664936465dd04913.tar.gz Qt-9e5c5e2c68f3aefd60571551664936465dd04913.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp index 9991ab4..7a0d40a 100644 --- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp +++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp @@ -352,7 +352,7 @@ void tst_QGraphicsEffectSource::pixmapPadding_data() QTest::newRow("log,effectrect") << int(Qt::LogicalCoordinates) << int(QGraphicsEffect::PadToEffectiveBoundingRect) - << QSize(30, 30) << QPoint(-10, -10) + << QSize(20, 20) << QPoint(-5, -5) << 0x00000000u; QTest::newRow("dev,nopad") << int(Qt::DeviceCoordinates) |