diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-02-15 11:53:54 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-15 22:39:19 +0000 |
| commit | 3062902f70c77abdb64ad2afbd02aaf149b3711d (patch) | |
| tree | dee5fa1ff8e4f77df59915453fda4a02f8a736df | |
| parent | 5c63d158c2b4a0d4c5ada4ca8da14ba4b3c069f0 (diff) | |
MinGW: fix warning in QMatrix4x4::map functions
The definitions get the following warning (treated as error):
redeclared without dllimport attribute after being referenced with dll
linkage [-Werror]
I take it to mean that because they are labelled 'inline' the compiler
disregards the 'dllimport', but that makes it inconsistent with the
declaration. So we label the declaration inline as well.
Change-Id: I87bb42141a1086b2c565db881077f33acb4aab64
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 10aa4b5c61b0073a76ff22946f1682f021cbd34b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 402f27fcb5..ec4253133a 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -157,14 +157,14 @@ public: QTransform toTransform() const; QTransform toTransform(float distanceToPlane) const; - QPoint map(const QPoint& point) const; - QPointF map(const QPointF& point) const; + inline QPoint map(const QPoint& point) const; + inline QPointF map(const QPointF& point) const; #ifndef QT_NO_VECTOR3D - QVector3D map(const QVector3D& point) const; - QVector3D mapVector(const QVector3D& vector) const; + inline QVector3D map(const QVector3D& point) const; + inline QVector3D mapVector(const QVector3D& vector) const; #endif #ifndef QT_NO_VECTOR4D - QVector4D map(const QVector4D& point) const; + inline QVector4D map(const QVector4D& point) const; #endif QRect mapRect(const QRect& rect) const; QRectF mapRect(const QRectF& rect) const; |