1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tst_qicon for fractional dpr

Browse Source 
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 <morten.sorvig@qt.io>
(cherry picked from commit b1f956106cf0fc41eb12d76bb3625fae7687e5f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Allan Sandfeld Jensen 2021-04-07 11:31:10 +02:00 committed by Qt Cherry-pick Bot
parent ac55ee919a
commit 64dcf17f94
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/auto/gui/image/qicon/tst_qicon.cpp
View File

@ -145,8 +145,8 @@ void tst_QIcon::actualSize()
auto expectedDeviceSize = [](QSize deviceIndependentExpectedSize, QSize maxSourceImageSize) -> QSize { auto expectedDeviceSize = [](QSize deviceIndependentExpectedSize, QSize maxSourceImageSize) -> QSize {
qreal dpr = qApp->devicePixelRatio(); qreal dpr = qApp->devicePixelRatio();
return QSize(qMin(int(deviceIndependentExpectedSize.width() * dpr), maxSourceImageSize.width()), return QSize(qMin(qRound(deviceIndependentExpectedSize.width() * dpr), maxSourceImageSize.width()),
qMin(int(deviceIndependentExpectedSize.height() * dpr), maxSourceImageSize.height())); qMin(qRound(deviceIndependentExpectedSize.height() * dpr), maxSourceImageSize.height()));
}; };
QSize sourceSize = QImage(source).size(); QSize sourceSize = QImage(source).size();
@ -411,6 +411,9 @@ void tst_QIcon::detach()
void tst_QIcon::addFile() void tst_QIcon::addFile()
{ {
if (qApp->devicePixelRatio() != int(qApp->devicePixelRatio()))
QSKIP("Test is not ready for non integer devicePixelRatio", QTest::SkipAll);
QIcon icon; QIcon icon;
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png")); icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-16.png"));
icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png")); icon.addFile(QLatin1String(":/styles/commonstyle/images/standardbutton-open-32.png"));