diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-23 00:33:52 (GMT) |
| commit | 6a3945d3ca3185c00597dcaefb93617620973ff5 (patch) | |
| tree | 0534630f29a2d513621adf33c6fb25085fcab220 /tests/auto/qpixmap | |
| parent | 1690ad91cc9e686e688aa7832a16cbf2c9336948 (diff) | |
| parent | 67e90b8a5701ef5b0653f012e74debc91e1b3b49 (diff) | |
| download | Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.zip Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.gz Qt-6a3945d3ca3185c00597dcaefb93617620973ff5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/qpixmap')
| -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 e461b64..7e0f466 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -1558,6 +1558,8 @@ void tst_QPixmap::loadFromDataImage_data() const QString prefix = QLatin1String(SRCDIR) + "/loadFromData"; #endif QTest::newRow("designer_argb32.png") << prefix + "/designer_argb32.png"; + // When no extension is provided we try all extensions that has been registered by image providers + QTest::newRow("designer_argb32") << prefix + "/designer_argb32.png"; QTest::newRow("designer_indexed8_no_alpha.png") << prefix + "/designer_indexed8_no_alpha.png"; QTest::newRow("designer_indexed8_with_alpha.png") << prefix + "/designer_indexed8_with_alpha.png"; QTest::newRow("designer_rgb32.png") << prefix + "/designer_rgb32.png"; |