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

Change-Id: Ia5727ce68001bcaab467f5fae3a4933d1217015f

2 files changed, 3 insertions, 7 deletions

diff --git a/tests/auto/gui/painting/qpathclipper/paths.cpp b/tests/auto/gui/painting/qpathclipper/paths.cpp
index 1328befd1b..a814958394 100644
--- a/tests/auto/gui/painting/qpathclipper/paths.cpp
+++ b/tests/auto/gui/painting/qpathclipper/paths.cpp
@@ -713,9 +713,5 @@ QPainterPath Paths::bezierQuadrant()
         path.closeSubpath();
     }
 
-    QMatrix m(2, 0,
-            0, 2,
-            0, 0);
-
     return path;
 }
diff --git a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
index 93035af7d3..01853d841a 100644
--- a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
@@ -152,9 +152,9 @@ void tst_QPathClipper::initTestCase()
     for (int i = 0; i < paths.size(); ++i) {
         QRectF bounds = paths[i].boundingRect();
 
-        QMatrix m(1, 0,
-                  0, 1,
-                  -bounds.center().x(), -bounds.center().y());
+        QTransform m(1, 0,
+                     0, 1,
+                     -bounds.center().x(), -bounds.center().y());
 
         paths[i] = m.map(paths[i]);
     }