diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-29 08:10:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-29 08:10:41 (GMT) |
| commit | df37b2e9023bc2cebe00c77be6040019cfdc24b6 (patch) | |
| tree | 06739d09b63dd673b510a5af31de7c30407bed6e /tests/auto/qpixmap/tst_qpixmap.cpp | |
| parent | f32abd2b9febdeadeb5536d0318f77be4180f142 (diff) | |
| parent | cabfa68f3e37e79a18775a9970f6d166e75ece07 (diff) | |
| download | Qt-df37b2e9023bc2cebe00c77be6040019cfdc24b6.zip Qt-df37b2e9023bc2cebe00c77be6040019cfdc24b6.tar.gz Qt-df37b2e9023bc2cebe00c77be6040019cfdc24b6.tar.bz2 | |
Merge commit origin/4.6 into team-widgets/4.6
Diffstat (limited to 'tests/auto/qpixmap/tst_qpixmap.cpp')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 9f5aee2..53b6230 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -166,6 +166,7 @@ private slots: void fromImage_crash(); void fromData(); + void loadFromDataNullValues(); void preserveDepth(); }; @@ -1436,6 +1437,26 @@ void tst_QPixmap::fromData() QCOMPARE(img.pixel(0, 1), QRgb(0xff000000)); } +void tst_QPixmap::loadFromDataNullValues() +{ + { + QPixmap pixmap; + pixmap.loadFromData(QByteArray()); + QVERIFY(pixmap.isNull()); + } + { + QPixmap pixmap; + pixmap.loadFromData(0, 123); + QVERIFY(pixmap.isNull()); + } + { + QPixmap pixmap; + const uchar bla[] = "bla"; + pixmap.loadFromData(bla, 0); + QVERIFY(pixmap.isNull()); + } +} + void tst_QPixmap::task_246446() { // This crashed without the bugfix in 246446 |