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

Doc: Add missing since 6.2 to QImage and QPixmap

Browse Source 
The deviceIndependentSize() function of QImage and QPixmap was added
in Qt 6.2 but their docs are missing this information, so add them.

And it seems the QImage docs were copied from QPixmap, so it still
reference to pixmap, not image, fix it as a drive-by.

Change-Id: Ic3d0a2019b5e9b89bd8723d994d7ae54f2cb5257
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 0d20e6e4957b3842b659522f330b8a201ef8e505)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Yuhang Zhao 2022-09-05 10:03:03 +08:00 committed by Qt Cherry-pick Bot
parent 5d22bfd65d
commit 98293ba71d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/image/qimage.cpp
View File

@ -1499,12 +1499,14 @@ void QImage::setDevicePixelRatio(qreal scaleFactor)
}
/*!
Returns the size of the pixmap in device independent pixels.
Returns the size of the image in device independent pixels.
This value should be used when using the pixmap size in user interface
This value should be used when using the image size in user interface
size calculations.
The return value is equivalent to pixmap.size() / pixmap.devicePixelRatio(),
The return value is equivalent to image.size() / image.devicePixelRatio().
\since 6.2
*/
QSizeF QImage::deviceIndependentSize() const
{

4
src/gui/image/qpixmap.cpp
View File

@ -654,7 +654,9 @@ void QPixmap::setDevicePixelRatio(qreal scaleFactor)
This value should be used when using the pixmap size in user interface
size calculations.
The return value is equivalent to pixmap.size() / pixmap.devicePixelRatio(),
The return value is equivalent to pixmap.size() / pixmap.devicePixelRatio().
\since 6.2
*/
QSizeF QPixmap::deviceIndependentSize() const
{