diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h | 4 | ||||
| -rw-r--r-- | tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h b/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h index ac1c89d98..27305dfab 100644 --- a/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h +++ b/tests/auto/unit/qmultimedia_common/mockaudiodecodercontrol.h @@ -53,8 +53,6 @@ #define MOCK_DECODER_MAX_BUFFERS 10 -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class MockAudioDecoderControl : public QAudioDecoderControl @@ -218,6 +216,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIODECODERCONTROL_H diff --git a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp index e9e71edff..7671c7ec6 100644 --- a/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp +++ b/tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp @@ -1039,12 +1039,6 @@ void tst_QPainterVideoSurface::shaderPresent() QVideoSurfaceFormat formatA(frameSizeA, pixelFormatA); -#if defined(Q_OS_LINUX) && !defined(UBUNTU_PRECISE_PANGOLIN) - QEXPECT_FAIL("ARBfp: rgb32 -> argb32", "QTBUG-26320 - Failing for linux versions", Abort); - QEXPECT_FAIL("ARBfp: rgb32 -> rgb565", "QTBUG-26320 - Failing for linux versions", Abort); - QEXPECT_FAIL("ARBfp: rgb32 -> yuv420p", "QTBUG-26320 - Failing for linux versions", Abort); - QEXPECT_FAIL("ARBfp: yv12 -> rgb32", "QTBUG-26320 - Failing for linux versions", Abort); -#endif QVERIFY(surface.start(formatA)); QCOMPARE(surface.isActive(), true); QCOMPARE(surface.isReady(), true); |