diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-10-01 09:29:21 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-10-02 12:47:43 +0200 |
| commit | 55689e301c74b2ef20b9283ebb29417ef1657fe2 (patch) | |
| tree | b8dbb95f1367e176448fe95a699c33fe5d3cc04b /src/gui/math3d | |
| parent | fe360a9d52ad7cdf8819ca84031d6c21e22a33a1 (diff) | |
Purge Q_NO_TEMPLATE_FRIENDS and platforms lacking support for them
Given that we rely on C++17, it should be safe to mandate that level of
language support.
Change-Id: If07ccb36bea2a5113a8f5aacf635be7d2590baf7
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index 9d8869ff3a..47a77d1e52 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -79,7 +79,6 @@ public: const T *data() const { return *m; } const T *constData() const { return *m; } -#if !defined(Q_NO_TEMPLATE_FRIENDS) template<int NN, int MM, typename TT> friend QGenericMatrix<NN, MM, TT> operator+(const QGenericMatrix<NN, MM, TT>& m1, const QGenericMatrix<NN, MM, TT>& m2); template<int NN, int MM, typename TT> @@ -96,13 +95,10 @@ public: friend QGenericMatrix<NN, MM, TT> operator/(const QGenericMatrix<NN, MM, TT>& matrix, TT divisor); private: -#endif T m[N][M]; // Column-major order to match OpenGL. -#if !defined(Q_NO_TEMPLATE_FRIENDS) template <int NN, int MM, typename TT> friend class QGenericMatrix; -#endif }; template <int N, int M, typename T> class QTypeInfo<QGenericMatrix<N, M, T> > |