From 64dcf17f94e4c2b1fd9cd10f88e7d53b3f843905 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Apr 2021 11:31:10 +0200 Subject: [PATCH] Fix tst_qicon for fractional dpr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add rounding one place, and skip addFile for now since the assumption about rounding dpr up no longer applies. Change-Id: I0a84dfabb218acf42cb3816ba50ef899c8762523 Reviewed-by: Morten Johan Sørvig (cherry picked from commit b1f956106cf0fc41eb12d76bb3625fae7687e5f3) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/gui/image/qicon/tst_qicon.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp index 5130351c366..7bd7fe3febe 100644 --- a/tests/auto/gui/image/qicon/tst_qicon.cpp +++ b/tests/auto/gui/image/qicon/tst_qicon.cpp @@ -145,8 +145,8 @@ void tst_QIcon::actualSize() auto expectedDeviceSize = [](QSize deviceIndependentExpectedSize, QSize maxSourceImageSize) -> QSize { qreal dpr = qApp->devicePixelRatio(); - return QSize(qMin(int(deviceIndependentExpectedSize.width() * dpr), maxSourceImageSize.width()), - qMin(int(deviceIndependentExpectedSize.height() * dpr), maxSourceImageSize.height())); + return QSize(qMin(qRound(deviceIndependentExpectedSize.width() * dpr), maxSourceImageSize.width()), + qMin(qRound(deviceIndependentExpectedSize.height() * dpr), maxSourceImageSize.height())); }; QSize sourceSize = QImage(source).size(); @@ -411,6 +411,9 @@ void tst_QIcon::detach() void tst_QIcon::addFile() { + if (qApp->devicePixelRatio() != int(qApp->devicePixelRatio())) + QSKIP("Test is not ready for non integer devicePixelRatio", QTest::SkipAll); + QIcon icon; icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png")); icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png"));