diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-24 16:28:06 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-08-24 14:45:45 +0000 |
| commit | 20641814051802d285d6000e054e2eb92e9218f4 (patch) | |
| tree | 4a21cb45cf8b000b2eeae1d7fa73db4327189ccd /tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | |
| parent | 23acd9f01d5dcca84025eb95de266e7e6b6cb386 (diff) | |
Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests.
There was only one test actually using the deprecated
WaitForWindowShown(). Replace by qWaitForWindowExposed()
and remove define.
Change-Id: I2e71edca8f8be26c9a63b6a9d1fa30b31979c1fe
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
Diffstat (limited to 'tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp')
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; |