diff options
author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2012-10-10 18:43:25 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 19:00:42 +0200 |
commit | cb010ebf5cea10fdc7b9c5158a0f843664faf735 (patch) | |
tree | cd8df46474aa1789dba0265187819f7607e94b58 /tests | |
parent | bc7e9fe7c7a42e1cad7572b85982e1ce73f80dd1 (diff) |
Build fix after a QVariant change
QVariant(Qt::GlobalColor) ctor was removed in Qt5.
Change-Id: If272ff26003cdc58eb3decf5030e927134d126b0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp index a814b78e1..07b7e9114 100644 --- a/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp +++ b/tests/auto/unit/qvideosurfaceformat/tst_qvideosurfaceformat.cpp @@ -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)); } |