5 files changed, 34 insertions, 1 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
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index b8df4b83d1..35dc41be2d 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -241,8 +241,12 @@ public:
                  Qt::TransformationMode mode = Qt::FastTransformation) const;
     QImage scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
     QImage scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use transformed(const QTransform &matrix, Qt::TransformationMode mode)")
     QImage transformed(const QMatrix &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
+    QT_DEPRECATED_X("trueMatrix(const QTransform &, int w, int h)")
     static QMatrix trueMatrix(const QMatrix &, int w, int h);
+#endif // QT_DEPRECATED_SINCE(5, 15)
     QImage transformed(const QTransform &matrix, Qt::TransformationMode mode = Qt::FastTransformation) const;
     static QTransform trueMatrix(const QTransform &, int w, int h);
     QImage mirrored(bool horizontally = false, bool vertically = true) const &
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index adadba2057..269f236ecd 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -438,7 +438,7 @@ QImage QPixmap::toImage() const
 }
 
 /*!
-    \fn QMatrix QPixmap::trueMatrix(const QTransform &matrix, int width, int height)
+    \fn QTransform QPixmap::trueMatrix(const QTransform &matrix, int width, int height)
 
     Returns the actual matrix used for transforming a pixmap with the
     given \a width, \a height and \a matrix.
@@ -458,8 +458,12 @@ QTransform QPixmap::trueMatrix(const QTransform &m, int w, int h)
     return QImage::trueMatrix(m, w, h);
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
   \overload
+  \obsolete
+
+  Use trueMatrix(const QTransform &m, int w, int h) instead.
 
   This convenience function loads the matrix \a m into a
   QTransform and calls the overloaded function with the
@@ -469,6 +473,7 @@ QMatrix QPixmap::trueMatrix(const QMatrix &m, int w, int h)
 {
     return trueMatrix(QTransform(m), w, h).toAffine();
 }
+#endif // QT_DEPRECATED_SINCE(5, 15)
 
 
 /*!
@@ -1233,8 +1238,12 @@ QPixmap QPixmap::transformed(const QTransform &transform,
     return data->transformed(transform, mode);
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
   \overload
+  \obsolete
+
+  Use transformed(const QTransform &transform, Qt::TransformationMode mode)() instead.
 
   This convenience function loads the \a matrix into a
   QTransform and calls the overloaded function.
@@ -1243,6 +1252,7 @@ QPixmap QPixmap::transformed(const QMatrix &matrix, Qt::TransformationMode mode)
 {
     return transformed(QTransform(matrix), mode);
 }
+#endif // QT_DEPRECATED_SINCE(5, 15)
 
 
 
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 8a06ebe603..e47a9fe59e 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -129,8 +129,12 @@ public:
                    Qt::TransformationMode mode = Qt::FastTransformation) const;
     QPixmap scaledToWidth(int w, Qt::TransformationMode mode = Qt::FastTransformation) const;
     QPixmap scaledToHeight(int h, Qt::TransformationMode mode = Qt::FastTransformation) const;
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use transformed(const QTransform &, Qt::TransformationMode mode)")
     QPixmap transformed(const QMatrix &, Qt::TransformationMode mode = Qt::FastTransformation) const;
+    QT_DEPRECATED_X("Use trueMatrix(const QTransform &m, int w, int h)")
     static QMatrix trueMatrix(const QMatrix &m, int w, int h);
+#endif // QT_DEPRECATED_SINCE(5, 15)
     QPixmap transformed(const QTransform &, Qt::TransformationMode mode = Qt::FastTransformation) const;
     static QTransform trueMatrix(const QTransform &m, int w, int h);
 
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index 251f09fe52..49f9550519 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -916,6 +916,9 @@ bool QPNGImageWriter::writeImage(const QImage& image, int compression_in, const
     }
 
     png_set_error_fn(png_ptr, nullptr, nullptr, qt_png_warning);
+#ifdef PNG_BENIGN_ERRORS_SUPPORTED
+    png_set_benign_errors(png_ptr, 1);
+#endif
 
     info_ptr = png_create_info_struct(png_ptr);
     if (!info_ptr) {