3 files changed, 4 insertions, 64 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/BLACKLIST b/tests/auto/gui/kernel/qguiapplication/BLACKLIST
index e6ffe78ae3..58ca7bf782 100644
--- a/tests/auto/gui/kernel/qguiapplication/BLACKLIST
+++ b/tests/auto/gui/kernel/qguiapplication/BLACKLIST
@@ -1,3 +1,6 @@
 [focusObject]
 ubuntu-16.04
 opensuse-42.3
+
+[quitOnLastWindowClosedMulti]
+macos ci
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index 78638a7518..97c6ad60b8 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -46,8 +46,6 @@ private slots:
     void qhash();
     void translate();
     void scale();
-    void matrix();
-    void testOffset();
     void types();
     void types2_data();
     void types2();
@@ -372,67 +370,6 @@ void tst_QTransform::scale()
     QVERIFY( QTransform::fromScale( 1, 1 ) == QTransform());
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-QT_WARNING_PUSH
-QT_WARNING_DISABLE_DEPRECATED
-void tst_QTransform::matrix()
-{
-    QMatrix mat1;
-    mat1.scale(0.3, 0.7);
-    mat1.translate(53.3, 94.4);
-    mat1.rotate(45);
-
-    QMatrix mat2;
-    mat2.rotate(33);
-    mat2.scale(0.6, 0.6);
-    mat2.translate(13.333, 7.777);
-
-    QTransform tran1(mat1);
-    QTransform tran2(mat2);
-    QTransform dummy;
-    dummy.setMatrix(mat1.m11(), mat1.m12(), 0,
-                    mat1.m21(), mat1.m22(), 0,
-                    mat1.dx(), mat1.dy(), 1);
-
-    QCOMPARE(tran1, dummy);
-    QCOMPARE(tran1.inverted(), dummy.inverted());
-    QCOMPARE(tran1.inverted(), QTransform(mat1.inverted()));
-    QCOMPARE(tran2.inverted(), QTransform(mat2.inverted()));
-
-    QMatrix mat3 = mat1 * mat2;
-    QTransform tran3 = tran1 * tran2;
-    QCOMPARE(QTransform(mat3), tran3);
-
-    /* QMatrix::operator==() doesn't use qFuzzyCompare(), which
-     * on win32-g++ results in a failure. So we work around it by
-     * calling QTranform::operator==(), which performs a fuzzy compare. */
-    QCOMPARE(QTransform(mat3), QTransform(tran3.toAffine()));
-
-    QTransform tranInv = tran1.inverted();
-    QMatrix   matInv = mat1.inverted();
-
-    QRect rect(43, 70, 200, 200);
-    QPoint pt(43, 66);
-    QCOMPARE(tranInv.mapRect(rect), matInv.mapRect(rect));
-    QCOMPARE(tranInv.map(pt), matInv.map(pt));
-
-    QPainterPath path;
-    path.moveTo(55, 60);
-    path.lineTo(110, 110);
-    path.quadTo(220, 50, 10, 20);
-    path.closeSubpath();
-    QCOMPARE(tranInv.map(path), matInv.map(path));
-}
-
-void tst_QTransform::testOffset()
-{
-    QTransform trans;
-    const QMatrix &aff = trans.toAffine();
-    QCOMPARE((void*)(&aff), (void*)(&trans));
-}
-QT_WARNING_POP
-#endif
-
 void tst_QTransform::types()
 {
     QTransform m1;
diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp
index 3a7ad6dad5..cf839e1931 100644
--- a/tests/auto/gui/qopengl/tst_qopengl.cpp
+++ b/tests/auto/gui/qopengl/tst_qopengl.cpp
@@ -28,6 +28,7 @@
 
 #include <QtOpenGL/QOpenGLPaintDevice>
 #include <QtOpenGL/QOpenGLTexture>
+#include <QtOpenGL/qopengltextureblitter.h>
 #include <QtGui/private/qopenglcontext_p.h>
 #include <QtGui/QOpenGLFramebufferObject>
 #include <QtGui/QOpenGLFunctions>
@@ -40,7 +41,6 @@
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QGenericMatrix>
 #include <QtGui/QMatrix4x4>
-#include <QtGui/qopengltextureblitter.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qopenglextensions_p.h>
 #include <qpa/qplatformintegration.h>