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

Fix deprecation warning in QIcon::actualSize()

Browse Source 
The non-deprecated one called the deprecated one :-(
Inline the deprecated one and simplify, given the null pointer passed down.

Change-Id: I5b99053357fc3be109e61ccf1161835bf527b686
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Edward Welbourne 2020-09-11 15:57:10 +02:00
parent 3983afd48f
commit ab75227c10
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/image/qicon.cpp
View File

@ -1,6 +1,6 @@
/**************************************************************************** /****************************************************************************
** **
** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2020 The Qt Company Ltd.
** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com> ** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com>
** Contact: https://www.qt.io/licensing/ ** Contact: https://www.qt.io/licensing/
** **
@ -894,7 +894,15 @@ QSize QIcon::actualSize(const QSize &size, Mode mode, State state) const
{ {
if (!d) if (!d)
return QSize(); return QSize();
return actualSize(nullptr, size, mode, state);
const qreal devicePixelRatio = qApp->devicePixelRatio();
// Handle the simple normal-dpi case:
if (!(devicePixelRatio > 1.0))
return d->engine->actualSize(size, mode, state);
const QSize actualSize = d->engine->actualSize(size * devicePixelRatio, mode, state);
return actualSize / d->pixmapDevicePixelRatio(devicePixelRatio, size, actualSize);
} }
/*! /*!