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

Build fix after a QVariant change

Browse Source 
QVariant(Qt::GlobalColor) ctor was removed in Qt5.

Change-Id: If272ff26003cdc58eb3decf5030e927134d126b0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Jędrzej Nowacki
2012-10-10 18:43:25 +02:00
committed by The Qt Project
parent bc7e9fe7c7
commit cb010ebf5c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp
View File

@@ -895,14 +895,14 @@ void tst_QVideoSurfaceFormat::propertyEdgeCases()
QCOMPARE(original.sizeHint(), QSize(1024,768));
// Now test setting some r/w properties with the wrong data type
original.setProperty("frameSize", Qt::red);
original.setProperty("frameSize", QColor(Qt::red));
QCOMPARE(original.frameSize(), QSize(1024, 768));
original.setProperty("viewport", Qt::red);
original.setProperty("viewport", QColor(Qt::red));
QCOMPARE(original.viewport(), QRect(0, 0, 1024, 768));
original.setScanLineDirection(QVideoSurfaceFormat::BottomToTop);
original.setProperty("scanLineDirection", Qt::red);
original.setProperty("scanLineDirection", QColor(Qt::red));
QCOMPARE(original.scanLineDirection(), QVideoSurfaceFormat::BottomToTop);
original.setFrameRate(32);
@@ -914,7 +914,7 @@ void tst_QVideoSurfaceFormat::propertyEdgeCases()
QCOMPARE(original.yCbCrColorSpace(), QVideoSurfaceFormat::YCbCr_BT709);
original.setPixelAspectRatio(53, 45);
original.setProperty("pixelAspectRatio", Qt::red);
original.setProperty("pixelAspectRatio", QColor(Qt::red));
QCOMPARE(original.pixelAspectRatio(), QSize(53, 45));
}