diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qpixmap/tst_qpixmap.cpp | 6 | ||||
| -rw-r--r-- | tests/manual/imageconversion/main.cpp | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/qpixmap/tst_qpixmap.cpp index 10443e4..b028f52 100644 --- a/tests/auto/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/qpixmap/tst_qpixmap.cpp @@ -227,7 +227,7 @@ void tst_QPixmap::toHICON() SelectObject(bitmapDc, bitmap); const QString imageFileName = pngFileName(image, width, height); - QVERIFY2(QFileInfo(imageFileName).exists(), qPrintable(imageFileName)); + QVERIFY2(QFileInfo::exists(imageFileName), qPrintable(imageFileName)); const QImage imageFromFile = QImage(imageFileName).convertToFormat(QImage::Format_ARGB32_Premultiplied); QVERIFY(!imageFromFile.isNull()); @@ -262,7 +262,7 @@ void tst_QPixmap::fromHICON() QFETCH(QString, image); const QString iconFileName = image + QStringLiteral(".ico"); - QVERIFY2(QFileInfo(iconFileName).exists(), qPrintable(iconFileName)); + QVERIFY2(QFileInfo::exists(iconFileName), qPrintable(iconFileName)); const HICON icon = static_cast<HICON>(LoadImage(nullptr, reinterpret_cast<const wchar_t *>(iconFileName.utf16()), @@ -271,7 +271,7 @@ void tst_QPixmap::fromHICON() DestroyIcon(icon); const QString imageFileName = pngFileName(image, width, height); - QVERIFY2(QFileInfo(imageFileName).exists(), qPrintable(imageFileName)); + QVERIFY2(QFileInfo::exists(imageFileName), qPrintable(imageFileName)); const QImage imageFromFile = QImage(imageFileName).convertToFormat(QImage::Format_ARGB32_Premultiplied); QVERIFY(!imageFromFile.isNull()); diff --git a/tests/manual/imageconversion/main.cpp b/tests/manual/imageconversion/main.cpp index ec388b2..a0fc46a 100644 --- a/tests/manual/imageconversion/main.cpp +++ b/tests/manual/imageconversion/main.cpp @@ -243,9 +243,8 @@ void PaintWidget::saveBitmap() if (image.save(fileName)) { qDebug().noquote() << "saved" << QDir::toNativeSeparators(fileName); break; - } else { - qWarning().noquote() << "Could not save" << QDir::toNativeSeparators(fileName); } + qWarning().noquote() << "Could not save" << QDir::toNativeSeparators(fileName); } } |