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

Partially revert "QPaintDevice: inline keyword only on a method's declaration in-class"

Browse Source 
This partially reverts commit 77f5846d213b8355d369695c68d585d0d5fa47ce.

Reason for revert: caused a link error in Qt for Python.

Change-Id: I0e8034cb35b7b6cfc0f70e1d46d8fb7486c4aae3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit 53e44e753b7cfc5c873ef5a1fc577cfb6308d9d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Eirik Aavitsland 2024-06-24 09:55:35 +00:00 committed by Qt Cherry-pick Bot
parent 308f80d172
commit b8aa8ec88c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/painting/qpaintdevice.h
View File

@ -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));