diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-18 13:13:10 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-18 13:13:10 (GMT) |
| commit | 3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2 (patch) | |
| tree | b35fb5f723752378dd4fede93a6c35c0aeb85ad2 /tests/auto/qpixmap/tst_qpixmap.cpp | |
| parent | 1aeccd6bd14d7d9e098e333715f63e0225cd4a54 (diff) | |
| parent | 2c07b5d2cba8d8e499bd0861eefef12d4e00d99a (diff) | |
| download | Qt-3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2.zip Qt-3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2.tar.gz Qt-3b7b05ce8db881acfdcf193b3c8fb3d4919eb1c2.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8'
Diffstat (limited to 'tests/auto/qpixmap/tst_qpixmap.cpp')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 98f7839..3462850 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -198,6 +198,7 @@ private slots: #endif void drawPixmapWhilePainterOpen(); + void scaled_QTBUG19157(); }; static bool lenientCompare(const QPixmap &actual, const QPixmap &expected) @@ -1698,8 +1699,8 @@ void tst_QPixmap::fromImageReaderAnimatedGif() QImageReader referenceReader(path); QImageReader pixmapReader(path); - Q_ASSERT(referenceReader.canRead()); - Q_ASSERT(referenceReader.imageCount() > 1); + QVERIFY(referenceReader.canRead()); + QVERIFY(referenceReader.imageCount() > 1); for (int i = 0; i < referenceReader.imageCount(); ++i) { QImage refImage = referenceReader.read(); @@ -1958,5 +1959,12 @@ void tst_QPixmap::drawPixmapWhilePainterOpen() } } +void tst_QPixmap::scaled_QTBUG19157() +{ + QPixmap foo(5000, 1); + foo = foo.scaled(1024, 1024, Qt::KeepAspectRatio); + QVERIFY(!foo.isNull()); +} + QTEST_MAIN(tst_QPixmap) #include "tst_qpixmap.moc" |