diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 16:38:25 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-03-21 16:38:25 (GMT) |
| commit | 123a3aacd6a40fb07a225ef4db34ff7f986363ce (patch) | |
| tree | 69744fb08a3b0dd4e246b90d2e90d4f533ca768b /tests/auto/qpixmap/tst_qpixmap.cpp | |
| parent | f92501a82f5bca1ccac07ed17850c84b281a1fb1 (diff) | |
| parent | 12689cc05936d675c8a7065cf39b8334b83f95bb (diff) | |
| download | Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.zip Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.tar.gz Qt-123a3aacd6a40fb07a225ef4db34ff7f986363ce.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.7' into 4.7
Conflicts:
dist/changes-4.7.4
Diffstat (limited to 'tests/auto/qpixmap/tst_qpixmap.cpp')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index bd9c26f..464cd3b 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -52,6 +52,7 @@ #include <qsplashscreen.h> #include <private/qpixmapdata_p.h> +#include <private/qdrawhelper_p.h> #include <QSet> @@ -1264,7 +1265,10 @@ void tst_QPixmap::fromSymbianCFbsBitmap() QCOMPARE(actualColor, color); QImage shouldBe(pixmap.width(), pixmap.height(), image.format()); - shouldBe.fill(color.rgba()); + if (image.format() == QImage::Format_RGB16) + shouldBe.fill(qrgb565(color.rgba()).rawValue()); + else + shouldBe.fill(color.rgba()); QCOMPARE(image, shouldBe); } __UHEAP_MARKEND; |