diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:42:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-30 12:42:27 (GMT) |
| commit | dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc (patch) | |
| tree | 05f9f9bc92322c9b42257c00ae2df14700fdd35f /tests/auto/qpixmap/tst_qpixmap.cpp | |
| parent | 79a7c969983eafeef67cce28724c3981cf3af1ea (diff) | |
| parent | e95e69f7d1209cceacdef0f26416b93c1d83e8e0 (diff) | |
| download | Qt-dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc.zip Qt-dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc.tar.gz Qt-dc1b1b37e1ebe055d3bd46bc43e0c3b9612560bc.tar.bz2 | |
Merge commit 'origin/4.6' into 4.6
Diffstat (limited to 'tests/auto/qpixmap/tst_qpixmap.cpp')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 53b6230..8e02c74 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -1134,6 +1134,8 @@ void tst_QPixmap::fromSymbianCFbsBitmap_data() QTest::newRow("EColor4K big") << EColor4K << largeWidth << largeHeight << QColor(Qt::red); QTest::newRow("EColor64K small") << EColor64K << smallWidth << smallHeight << QColor(Qt::green); QTest::newRow("EColor64K big") << EColor64K << largeWidth << largeHeight << QColor(Qt::green); + QTest::newRow("EColor16M small") << EColor16M << smallWidth << smallHeight << QColor(Qt::yellow); + QTest::newRow("EColor16M big") << EColor16M << largeWidth << largeHeight << QColor(Qt::yellow); QTest::newRow("EColor16MU small") << EColor16MU << smallWidth << smallHeight << QColor(Qt::red); QTest::newRow("EColor16MU big") << EColor16MU << largeWidth << largeHeight << QColor(Qt::red); QTest::newRow("EColor16MA small opaque") << EColor16MA << smallWidth << smallHeight << QColor(255, 255, 0); |