diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-08-20 18:31:06 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-26 01:03:22 +0200 |
| commit | acbf9a858b6b389103b7f43f4f4892a142ec56c6 (patch) | |
| tree | 1c5e7feae0cd6999e37fca0644d152c76d29a790 /src/gui | |
| parent | db21bad936a761f475145886f1e06dfcfa11eb80 (diff) | |
Cleanup QTypeInfo
Remove QTypeInfo::isStatic, as that's not used anymore in Qt 6.
Also remove sizeOf, it's unused, and we have QMetaType for that if
required.
Remove all typeinfo declaractions for trivial types, as the default
template covers them correctly nowadays.
Finally set up a better default for isPointer, and do some smaller
cleanups all over the place.
Change-Id: I6758ed37dfc701feaaf0ff105cc95e32da9f9c33
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/math3d/qgenericmatrix.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index 81fc9eee62..1381014a04 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -108,12 +108,6 @@ template <int N, int M, typename T> class QTypeInfo<QGenericMatrix<N, M, T> > : public QTypeInfoMerger<QGenericMatrix<N, M, T>, T> { -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -public: - enum { - isStatic = true, - }; // at least Q_RELOCATABLE_TYPE, for BC during Qt 5 -#endif }; template <int N, int M, typename T> @@ -350,7 +344,7 @@ QDebug operator<<(QDebug dbg, const QGenericMatrix<N, M, T> &m) { QDebugStateSaver saver(dbg); dbg.nospace() << "QGenericMatrix<" << N << ", " << M - << ", " << QTypeInfo<T>::name() + << ", " << QMetaType::fromType<T>().name() << ">(" << Qt::endl << qSetFieldWidth(10); for (int row = 0; row < M; ++row) { for (int col = 0; col < N; ++col) |