diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-03-10 11:26:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-10 16:04:28 +0100 |
| commit | 4c9885a0f580c8273a211a92b6fc55af1d4f03c0 (patch) | |
| tree | 819df2d0e6a660212947cd1acc4a31be2370bf75 /src/gui/math3d/qvector4d.h | |
| parent | 267eab3f398646b59f5773173cd22a97b8e9540a (diff) | |
Revert some previously added constexpr in QVector?d classes
This commit partly reverts cd91d8ad0281c984a01b8091696a6fdfdfa69514.
The revert is required as the used ifdef relied on undefined
compiler behavior. Especially Windows has had trouble. The revert reduces
the risk of breaks by future compilers.
The proper inline and constexpr has to wait until Qt 6.
Task-number: QTBUG-37122
Change-Id: I881fffb95fa46d9c170c9420a578f15640e18aea
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/gui/math3d/qvector4d.h')
| -rw-r--r-- | src/gui/math3d/qvector4d.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index 2bc5b79c14..9ab0eba09f 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -86,12 +86,7 @@ public: float operator[](int i) const; float length() const; -#ifdef QT_BUILD_GUI_LIB - float lengthSquared() const; -#else - Q_DECL_CONSTEXPR inline float lengthSquared() const - { return xp * xp + yp * yp + zp * zp + wp * wp; } -#endif + float lengthSquared() const; //In Qt 6 convert to inline and constexpr QVector4D normalized() const; void normalize(); @@ -102,12 +97,7 @@ public: QVector4D &operator*=(const QVector4D &vector); QVector4D &operator/=(float divisor); -#if defined(QT_BUILD_GUI_LIB) && !defined(QT_STATIC) - static float dotProduct(const QVector4D& v1, const QVector4D& v2); -#else - static float dotProduct(const QVector4D& v1, const QVector4D& v2) - { return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp + v1.wp * v2.wp; } -#endif + static float dotProduct(const QVector4D& v1, const QVector4D& v2); //In Qt 6 convert to inline and constexpr Q_DECL_CONSTEXPR friend inline bool operator==(const QVector4D &v1, const QVector4D &v2); Q_DECL_CONSTEXPR friend inline bool operator!=(const QVector4D &v1, const QVector4D &v2); |