From b8aa8ec88ce6c1756fe6afd4a1f1777e9ea23891 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Mon, 24 Jun 2024 09:55:35 +0000 Subject: [PATCH] Partially revert "QPaintDevice: inline keyword only on a method's declaration in-class" This partially reverts commit 77f5846d213b8355d369695c68d585d0d5fa47ce. Reason for revert: caused a link error in Qt for Python. Change-Id: I0e8034cb35b7b6cfc0f70e1d46d8fb7486c4aae3 Reviewed-by: Friedemann Kleint Reviewed-by: Ahmad Samir (cherry picked from commit 53e44e753b7cfc5c873ef5a1fc577cfb6308d9d0) Reviewed-by: Qt Cherry-pick Bot --- src/gui/painting/qpaintdevice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index e83e97a02c7..7011684df7f 100644 --- a/src/gui/painting/qpaintdevice.h +++ b/src/gui/painting/qpaintdevice.h @@ -61,7 +61,7 @@ protected: virtual void initPainter(QPainter *painter) const; virtual QPaintDevice *redirected(QPoint *offset) const; virtual QPainter *sharedPainter() const; - inline double getDecodedMetricF(PaintDeviceMetric metricA, PaintDeviceMetric metricB) const; + double getDecodedMetricF(PaintDeviceMetric metricA, PaintDeviceMetric metricB) const; ushort painters; // refcount private: @@ -84,7 +84,7 @@ inline int QPaintDevice::devType() const inline bool QPaintDevice::paintingActive() const { return painters != 0; } -int QPaintDevice::encodeMetricF(PaintDeviceMetric metric, double value) +inline int QPaintDevice::encodeMetricF(PaintDeviceMetric metric, double value) { qint32 buf[2]; Q_STATIC_ASSERT(sizeof(buf) == sizeof(double));