From fb5fb04fb7397e2aa5cd3358e7e6db3c17c20740 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 30 Dec 2024 22:35:12 +0100 Subject: [PATCH] tst_QImage: fix discarded QFile::open() results Wrap them in QVERIFY(), as usual. Found by QFile::open()-turned-nodiscard-come-6.10. Amends e673e5a257569eaa816c6acd31dd754efd9f8c75 and 25c96d547b4563cbfedcec6093d68116148d8599. Change-Id: Id39e5d9e500b524af8443cb57916a12f98bd7c23 Reviewed-by: Thiago Macieira (cherry picked from commit cf6ae9a90106a3557a8df1e0d2567b02a4ef6ded) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 11f485ea68cff32f550c3d99475bb859a7495f69) --- tests/auto/gui/image/qimage/tst_qimage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp index dfe28796991..5b6ad2cfffe 100644 --- a/tests/auto/gui/image/qimage/tst_qimage.cpp +++ b/tests/auto/gui/image/qimage/tst_qimage.cpp @@ -3431,7 +3431,7 @@ void tst_QImage::colorSpaceCmykConversion() QImage image(16, 16, QImage::Format_CMYK8888); QFile iccProfile(m_prefix +"CGATS001Compat-v2-micro.icc"); - iccProfile.open(QIODevice::ReadOnly); + QVERIFY2(iccProfile.open(QIODevice::ReadOnly), qPrintable(iccProfile.errorString())); image.setColorSpace(QColorSpace::fromIccProfile(iccProfile.readAll())); QVERIFY(image.colorSpace().isValid()); @@ -3490,7 +3490,7 @@ void tst_QImage::colorSpaceFromGrayConversion_data() }; QFile iccProfile(m_prefix + "VideoHD.icc"); - iccProfile.open(QIODevice::ReadOnly); + QVERIFY2(iccProfile.open(QIODevice::ReadOnly), qPrintable(iccProfile.errorString())); colorSpaces.append(QColorSpace::fromIccProfile(iccProfile.readAll())); for (auto fromFormat : formats) {