Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ia5727ce68001bcaab467f5fae3a4933d1217015f

1 files changed, 12 insertions, 0 deletions

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 74dc81e365..738aa29794 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -2847,7 +2847,13 @@ QImage QImage::scaledToHeight(int h, Qt::TransformationMode mode) const
 }
 
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 /*!
+    \obsolete
+
+    Use trueMatrix(const QTransform &matrix, int w, int h) instead.
+
     \fn QMatrix QImage::trueMatrix(const QMatrix &matrix, int width, int height)
 
     Returns the actual matrix used for transforming an image with the
@@ -2869,6 +2875,10 @@ QMatrix QImage::trueMatrix(const QMatrix &matrix, int w, int h)
 }
 
 /*!
+    \obsolete
+
+    Use transformed(const QTransform &matrix, Qt::TransformationMode mode) instead.
+
     Returns a copy of the image that is transformed using the given
     transformation \a matrix and transformation \a mode.
 
@@ -2893,6 +2903,8 @@ QImage QImage::transformed(const QMatrix &matrix, Qt::TransformationMode mode) c
     return transformed(QTransform(matrix), mode);
 }
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 /*!
     Builds and returns a 1-bpp mask from the alpha buffer in this
     image. Returns a null image if the image's format is