2 files changed, 6 insertions, 9 deletions
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 30ce70b79..848b1c806 100644
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -11,8 +11,5 @@ qtHaveModule(opengl) {
 SOURCES += tst_qpaintervideosurface.cpp
 
 QT+=widgets
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
 linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = precise ]"):DEFINES+=UBUNTU_PRECISE_PANGOLIN
-
-win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28542
diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index a68103912..7dcb103e5 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -563,7 +563,7 @@ void tst_QPainterVideoSurface::shaderType()
     QPainterVideoSurface surface;
     QGLWidget widget;
     widget.show();
-    QTest::qWaitForWindowShown(&widget);
+    QTest::qWaitForWindowExposed(&widget);
     widget.makeCurrent();
 
     QCOMPARE(surface.shaderType(), QPainterVideoSurface::NoShaders);
@@ -655,7 +655,7 @@ void tst_QPainterVideoSurface::shaderTypeStarted()
 
     QGLWidget widget;
     widget.show();
-    QTest::qWaitForWindowShown(&widget);
+    QTest::qWaitForWindowExposed(&widget);
     widget.makeCurrent();
 
     QPainterVideoSurface surface;
@@ -900,7 +900,7 @@ void tst_QPainterVideoSurface::shaderSupportedFormat()
 
     QGLWidget widget;
     widget.show();
-    QTest::qWaitForWindowShown(&widget);
+    QTest::qWaitForWindowExposed(&widget);
     widget.makeCurrent();
 
     QPainterVideoSurface surface;
@@ -1017,7 +1017,7 @@ void tst_QPainterVideoSurface::shaderPresent()
 
     QGLWidget widget;
     widget.show();
-    QTest::qWaitForWindowShown(&widget);
+    QTest::qWaitForWindowExposed(&widget);
     widget.makeCurrent();
 
     QPainterVideoSurface surface;
@@ -1148,7 +1148,7 @@ void tst_QPainterVideoSurface::shaderPresentOpaqueFrame()
 
     QGLWidget widget;
     widget.show();
-    QTest::qWaitForWindowShown(&widget);
+    QTest::qWaitForWindowExposed(&widget);
     widget.makeCurrent();
 
     QPainterVideoSurface surface;
@@ -1197,7 +1197,7 @@ void tst_QPainterVideoSurface::shaderPresentGLFrame()
 
     QGLWidget widget;
     widget.show();
-    QTest::qWaitForWindowShown(&widget);
+    QTest::qWaitForWindowExposed(&widget);
     widget.makeCurrent();
 
     QPainterVideoSurface surface;