diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2022-09-05 10:03:03 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2022-09-07 09:22:50 +0800 |
| commit | 0d20e6e4957b3842b659522f330b8a201ef8e505 (patch) | |
| tree | 27637cfcc3bae016bf3b98525c7d479afb44c8c6 /src/gui/image | |
| parent | c76f7cbbcbe68bf785e8d8cbbe641cd6c0e42834 (diff) | |
Doc: Add missing since 6.2 to QImage and QPixmap
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.
Pick-to: 6.4 6.3 6.2
Change-Id: Ic3d0a2019b5e9b89bd8723d994d7ae54f2cb5257
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qimage.cpp | 8 | ||||
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp index d63db07f91..c4bd15d95b 100644 --- a/src/gui/image/qimage.cpp +++ b/src/gui/image/qimage.cpp @@ -1487,12 +1487,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 { diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 081e28d1c6..4accabacc1 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -620,7 +620,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 { |