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

Fix XPASS on Ubuntu Precise Pangolin.

Browse Source 
Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf
Reviewed-by: Tobias Koenig
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This commit is contained in:
Friedemann Kleint
2013-02-18 12:11:29 +01:00
committed by The Qt Project
parent af359028bb
commit c64db5dfde
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
View File

@@ -13,4 +13,6 @@ SOURCES += tst_qpaintervideosurface.cpp
QT+=widgets QT+=widgets
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 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 win32:contains(QT_CONFIG, angle): CONFIG += insignificant_test # QTBUG-28542

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

@@ -1039,7 +1039,7 @@ void tst_QPainterVideoSurface::shaderPresent()
QVideoSurfaceFormat formatA(frameSizeA, pixelFormatA); QVideoSurfaceFormat formatA(frameSizeA, pixelFormatA);
#ifdef Q_OS_LINUX #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 -> argb32", "QTBUG-26320 - Failing for linux versions", Abort);
QEXPECT_FAIL("ARBfp: rgb32 -> rgb565", "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: rgb32 -> yuv420p", "QTBUG-26320 - Failing for linux versions", Abort);