slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove SkipMode parameter from QSKIP.

Browse Source 
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>
This commit is contained in:
Jason McDonald
2011-11-09 14:14:08 +10:00
committed by Qt by Nokia
parent 23af917dc5
commit 34cdc41a93
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp
View File

@@ -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);