diff --git a/src/gui/painting/qpaintdevice.cpp b/src/gui/painting/qpaintdevice.cpp index de21901e239..21c7e406f18 100644 --- a/src/gui/painting/qpaintdevice.cpp +++ b/src/gui/painting/qpaintdevice.cpp @@ -21,7 +21,7 @@ QPaintDevice::~QPaintDevice() \internal */ // ### Qt 7: Replace this workaround mechanism: virtual devicePixelRatio() and virtual metricF() -inline double QPaintDevice::getDecodedMetricF(PaintDeviceMetric metricA, PaintDeviceMetric metricB) const +double QPaintDevice::getDecodedMetricF(PaintDeviceMetric metricA, PaintDeviceMetric metricB) const { qint32 buf[2]; // The Encoded metric enum values come in pairs of one odd and one even value. diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index 7011684df7f..e83e97a02c7 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; - double getDecodedMetricF(PaintDeviceMetric metricA, PaintDeviceMetric metricB) const; + inline 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; } -inline int QPaintDevice::encodeMetricF(PaintDeviceMetric metric, double value) +int QPaintDevice::encodeMetricF(PaintDeviceMetric metric, double value) { qint32 buf[2]; Q_STATIC_ASSERT(sizeof(buf) == sizeof(double));