diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 20:20:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 20:20:56 (GMT) |
| commit | acbfa8717b07c2d5b85c62bcf70da3ef4983addb (patch) | |
| tree | 69c461d065f87e7ffb956e6f9ce16e54af5b4dda /tests | |
| parent | d3f6ef8177f53968b22ba3585eef3ca2c3d5be1d (diff) | |
| parent | ce61e3c3c6ff7f00d9b756c99e8fc031a69e68db (diff) | |
| download | Qt-acbfa8717b07c2d5b85c62bcf70da3ef4983addb.zip Qt-acbfa8717b07c2d5b85c62bcf70da3ef4983addb.tar.gz Qt-acbfa8717b07c2d5b85c62bcf70da3ef4983addb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.
Remove incorrect check in qpixmap autotest.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 464cd3b..0b5c30b 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -641,9 +641,12 @@ void tst_QPixmap::mask() QVERIFY(!pm.isNull()); QVERIFY(!bm.isNull()); - // hw: todo: this will fail if the default pixmap format is - // argb32_premultiplied. The mask will be all 1's - QVERIFY(pm.mask().isNull()); + if (!pm.hasAlphaChannel()) { + // This would fail if the default pixmap format is + // argb32_premultiplied. The mask will be all 1's. + // Therefore this is skipped when the alpha channel is present. + QVERIFY(pm.mask().isNull()); + } QImage img = bm.toImage(); QVERIFY(img.format() == QImage::Format_MonoLSB |