diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 03:29:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-31 03:29:31 (GMT) |
| commit | d14cae12f3e743943730d811a5a94ae2c3dbb871 (patch) | |
| tree | 315221217d1d2ab878e93673e6878e1559fa0c5c /tests/auto | |
| parent | b705fec8d093d06adbbd1baf461948b95a031759 (diff) | |
| parent | b50077584b5be8406b5c71d5b1efe3a1ff5adce3 (diff) | |
| download | Qt-d14cae12f3e743943730d811a5a94ae2c3dbb871.zip Qt-d14cae12f3e743943730d811a5a94ae2c3dbb871.tar.gz Qt-d14cae12f3e743943730d811a5a94ae2c3dbb871.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QStaticText with OpenGL1 engine
tst_qimage: backport fix of commit 0d7e683 into 4.7
qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qimage/tst_qimage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/qimage/tst_qimage.cpp index 49514dc..405eb98 100644 --- a/tests/auto/qimage/tst_qimage.cpp +++ b/tests/auto/qimage/tst_qimage.cpp @@ -1490,9 +1490,9 @@ void tst_QImage::smoothScale3() QRgb cb = b.pixel(x, y); // tolerate a little bit of rounding errors - QVERIFY(compare(qRed(ca), qRed(cb), 3)); - QVERIFY(compare(qGreen(ca), qGreen(cb), 3)); - QVERIFY(compare(qBlue(ca), qBlue(cb), 3)); + QVERIFY(compare(qRed(ca), qRed(cb), 16)); + QVERIFY(compare(qGreen(ca), qGreen(cb), 16)); + QVERIFY(compare(qBlue(ca), qBlue(cb), 16)); } } } |