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

4 files changed, 21 insertions, 5 deletions

diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index 1cb24f74b6..bbcceb1ce6 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -231,7 +231,6 @@
 #include <QtWidgets/qgraphicslayout.h>
 #include <QtWidgets/qgraphicsproxywidget.h>
 #include <QtWidgets/qgraphicswidget.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qpaintengine.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qpixmapcache.h>
diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h
index e72ed99a7b..e459b80970 100644
--- a/src/widgets/graphicsview/qgraphicsscene.h
+++ b/src/widgets/graphicsview/qgraphicsscene.h
@@ -47,7 +47,6 @@
 #include <QtGui/qbrush.h>
 #include <QtGui/qfont.h>
 #include <QtGui/qtransform.h>
-#include <QtGui/qmatrix.h>
 #include <QtGui/qpen.h>
 
 QT_REQUIRE_CONFIG(graphicsview);
diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp
index 102f3e894f..686b41960a 100644
--- a/src/widgets/graphicsview/qgraphicsview.cpp
+++ b/src/widgets/graphicsview/qgraphicsview.cpp
@@ -1795,7 +1795,13 @@ void QGraphicsView::setSceneRect(const QRectF &rect)
     d->recalculateContentSize();
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
+
 /*!
+    \obsolete
+
+    Use transform() instead.
+
     Returns the current transformation matrix for the view. If no current
     transformation is set, the identity matrix is returned.
 
@@ -1808,6 +1814,10 @@ QMatrix QGraphicsView::matrix() const
 }
 
 /*!
+    \obsolete
+
+    Use setTransform() instead.
+
     Sets the view's current transformation matrix to \a matrix.
 
     If \a combine is true, then \a matrix is combined with the current matrix;
@@ -1839,6 +1849,10 @@ void QGraphicsView::setMatrix(const QMatrix &matrix, bool combine)
 }
 
 /*!
+    \obsolete
+
+    Use resetTransform() instead.
+
     Resets the view transformation matrix to the identity matrix.
 
     \sa resetTransform()
@@ -1848,6 +1862,8 @@ void QGraphicsView::resetMatrix()
     resetTransform();
 }
 
+#endif // QT_DEPRECATED_SINCE(5, 15)
+
 /*!
     Rotates the current view transformation \a angle degrees clockwise.
 
diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h
index 1389796c3f..e98ec52d8f 100644
--- a/src/widgets/graphicsview/qgraphicsview.h
+++ b/src/widgets/graphicsview/qgraphicsview.h
@@ -165,9 +165,11 @@ public:
     void setSceneRect(const QRectF &rect);
     inline void setSceneRect(qreal x, qreal y, qreal w, qreal h);
 
-    QMatrix matrix() const;
-    void setMatrix(const QMatrix &matrix, bool combine = false);
-    void resetMatrix();
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use transform()") QMatrix matrix() const;
+    QT_DEPRECATED_X("Use setTransform()") void setMatrix(const QMatrix &matrix, bool combine = false);
+    QT_DEPRECATED_X("Use resetTransform()") void resetMatrix();
+#endif // QT_DEPRECATED_SINCE(5, 15)
     QTransform transform() const;
     QTransform viewportTransform() const;
     bool isTransformed() const;