Remove SkipMode parameter from QSKIP.

The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.

Task-number: QTBUG-21851, QTBUG-21652
Change-Id: Ib6225572a46eac7881222fdce192750b8b13ee3b
Reviewed-by: Steve Schilz <sschilz@pasco.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
index 53ed906e9..dc2a10df5 100644
--- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
+++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
@@ -666,7 +666,7 @@ void tst_QPainterVideoSurface::shaderTypeStarted()
     surface.setGLContext(const_cast<QGLContext *>(widget.context()));
 
     if (!(surface.supportedShaderTypes() & shaderType))
-        QSKIP("Shader type unsupported on this platform", SkipSingle);
+        QSKIP("Shader type unsupported on this platform");
 
     surface.setShaderType(shaderType);
     QCOMPARE(surface.shaderType(), shaderType);
@@ -909,11 +909,11 @@ void tst_QPainterVideoSurface::shaderSupportedFormat()
 
 
     if (!(surface.supportedShaderTypes() & shaderType))
-        QSKIP("Shader type not supported on this platform", SkipSingle);
+        QSKIP("Shader type not supported on this platform");
 
     surface.setShaderType(shaderType);
     if (surface.shaderType() != shaderType)
-        QSKIP("Shader type couldn't be set", SkipSingle);
+        QSKIP("Shader type couldn't be set");
 
     const QList<QVideoFrame::PixelFormat> pixelFormats = surface.supportedPixelFormats(handleType);
 
@@ -1023,11 +1023,11 @@ void tst_QPainterVideoSurface::shaderPresent()
     surface.setGLContext(const_cast<QGLContext *>(widget.context()));
 
     if (!(surface.supportedShaderTypes() & shaderType))
-        QSKIP("Shader type unsupported on this platform", SkipSingle);
+        QSKIP("Shader type unsupported on this platform");
 
     surface.setShaderType(shaderType);
     if (surface.shaderType() != shaderType)
-        QSKIP("Shader type couldn't be set", SkipSingle);
+        QSKIP("Shader type couldn't be set");
 
     QSignalSpy frameSpy(&surface, SIGNAL(frameChanged()));
 
@@ -1152,11 +1152,11 @@ void tst_QPainterVideoSurface::shaderPresentOpaqueFrame()
     surface.setGLContext(const_cast<QGLContext *>(widget.context()));
 
     if (!(surface.supportedShaderTypes() & shaderType))
-        QSKIP("Shader type unsupported on this platform", SkipSingle);
+        QSKIP("Shader type unsupported on this platform");
 
     surface.setShaderType(shaderType);
     if (surface.shaderType() != shaderType)
-        QSKIP("Shader type couldn't be set", SkipSingle);
+        QSKIP("Shader type couldn't be set");
 
     QVideoSurfaceFormat format(QSize(64, 64), QVideoFrame::Format_RGB32);
 
@@ -1199,11 +1199,11 @@ void tst_QPainterVideoSurface::shaderPresentGLFrame()
     surface.setGLContext(const_cast<QGLContext *>(widget.context()));
 
     if (!(surface.supportedShaderTypes() & shaderType))
-        QSKIP("Shader type unsupported on this platform", SkipSingle);
+        QSKIP("Shader type unsupported on this platform");
 
     surface.setShaderType(shaderType);
     if (surface.shaderType() != shaderType)
-        QSKIP("Shader type couldn't be set", SkipSingle);
+        QSKIP("Shader type couldn't be set");
 
     QVideoSurfaceFormat format(
             QSize(2, 2), QVideoFrame::Format_RGB32, QAbstractVideoBuffer::GLTextureHandle);