diff options
| author | Nico Vertriest <nico.vertriest@qt.io> | 2021-06-01 11:38:06 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@qt.io> | 2021-07-26 12:37:12 +0200 |
| commit | 111115bf8862b7cd1197c2ef8a4b475c882776d4 (patch) | |
| tree | 72e585f01df3a93a1e480709db030fd7d47a99ea /src/gui/math3d/qmatrix4x4.cpp | |
| parent | bd0d8a3adb98ff6f659e44e9a46decee32e9d94c (diff) | |
Doc: Ensure deprecated APIs in Gui are documented as such
Added missing #if-ery and deprecation macros to a QFont constructor
that was only documented as deprecated.
Fixes: QTBUG-94521
Fixes: QTBUG-95310
Pick-to: 6.2 6.1
Change-Id: I3d0418a3f7dca191a9068cc22627fe4deb7c53c5
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/gui/math3d/qmatrix4x4.cpp')
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp index 752b4944d0..dab7013a07 100644 --- a/src/gui/math3d/qmatrix4x4.cpp +++ b/src/gui/math3d/qmatrix4x4.cpp @@ -633,7 +633,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QVector3D operator*(const QVector3D& vector, const QMatrix4x4& matrix) \relates QMatrix4x4 - \deprecated Convert the QVector3D to a QVector4D first, then multiply. + \deprecated [6.1] Convert the QVector3D to a QVector4D first, then multiply. Returns the result of transforming \a vector according to \a matrix, with the matrix applied post-vector. The vector is transformed as a point. @@ -643,7 +643,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QVector3D operator*(const QMatrix4x4& matrix, const QVector3D& vector) \relates QMatrix4x4 - \deprecated Use QMatrix4x4::map() or QMatrix4x4::mapVector() instead. + \deprecated [6.1] Use QMatrix4x4::map() or QMatrix4x4::mapVector() instead. Returns the result of transforming \a vector according to \a matrix, with the matrix applied pre-vector. The vector is transformed as a @@ -696,7 +696,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QPoint operator*(const QMatrix4x4& matrix, const QPoint& point) \relates QMatrix4x4 - \deprecated Use QMatrix4x4::map() instead. + \deprecated [6.1] Use QMatrix4x4::map() instead. Returns the result of transforming \a point according to \a matrix, with the matrix applied pre-point. @@ -706,7 +706,7 @@ QMatrix4x4& QMatrix4x4::operator/=(float divisor) \fn QPointF operator*(const QMatrix4x4& matrix, const QPointF& point) \relates QMatrix4x4 - \deprecated Use QMatrix4x4::map() instead. + \deprecated [6.1] Use QMatrix4x4::map() instead. Returns the result of transforming \a point according to \a matrix, with the matrix applied pre-point. |