summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@qt.io>2020-08-06 17:39:13 +0200
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-08-26 20:09:51 +0000
commitfded035b1c808ece70cd49e27efd3f0e74f90ffc (patch)
tree7a3744ac2af803f9b423d132f37c074fdc264c8c /src/gui/painting
parent4073d3a10e6ea8faf893b5c6faba98a06a5851cc (diff)
Make QPaintDevice::devicePixelRatio() return qreal
For historical reasons Qt 5 has: int QPaintDevice::devicePixelRatio() qreal QPaintDevice::devicePixelRatioF() Change the int to qreal so that Qt 6 will have qreal QPaintDevice::devicePixelRatio() qreal QPaintDevice::devicePixelRatioF() [to-be-removed] Change-Id: Ie904e02ec490cbcd2acb5dcecb193e9af4cb90f0 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qpaintdevice.h4
-rw-r--r--src/gui/painting/qpaintdevice.qdoc4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h
index 5f8dad205d..ca5839e513 100644
--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
@@ -83,8 +83,8 @@ public:
int logicalDpiY() const { return metric(PdmDpiY); }
int physicalDpiX() const { return metric(PdmPhysicalDpiX); }
int physicalDpiY() const { return metric(PdmPhysicalDpiY); }
- int devicePixelRatio() const { return metric(PdmDevicePixelRatio); }
- qreal devicePixelRatioF() const { return metric(PdmDevicePixelRatioScaled) / devicePixelRatioFScale(); }
+ qreal devicePixelRatio() const { return metric(PdmDevicePixelRatioScaled) / devicePixelRatioFScale(); }
+ qreal devicePixelRatioF() const { return devicePixelRatio(); }
int colorCount() const { return metric(PdmNumColors); }
int depth() const { return metric(PdmDepth); }
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc
index 3b93faed84..9fbe5956af 100644
--- a/src/gui/painting/qpaintdevice.qdoc
+++ b/src/gui/painting/qpaintdevice.qdoc
@@ -123,7 +123,7 @@
The constant scaling factor used is devicePixelRatioFScale(). This enum value
has been introduced in Qt 5.6.
- \sa metric(), devicePixelRatioF()
+ \sa metric(), devicePixelRatio()
*/
/*!
@@ -284,7 +284,7 @@
*/
/*!
- \fn int QPaintDevice::devicePixelRatio() const
+ \fn qreal QPaintDevice::devicePixelRatio() const
Returns the device pixel ratio for device.