diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-13 09:17:15 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-13 09:17:15 (GMT) |
| commit | e287f1b01dd50106f58967861a1c272b248d450a (patch) | |
| tree | 0b1f2d787772fc0c27d9daf368823ea65a1ccaf0 /tests/auto | |
| parent | 2e5706eeee2fb9ce543466f469ace2d49ed4be64 (diff) | |
| parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
| download | Qt-e287f1b01dd50106f58967861a1c272b248d450a.zip Qt-e287f1b01dd50106f58967861a1c272b248d450a.tar.gz Qt-e287f1b01dd50106f58967861a1c272b248d450a.tar.bz2 | |
Merge commit 'upstream/4.6' into 4.6
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp index a47cb48..2b78d20 100644 --- a/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp +++ b/tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp @@ -292,13 +292,13 @@ void tst_QVideoSurfaceFormat::frameRate_data() QTest::addColumn<qreal>("frameRate"); QTest::newRow("null") - << 0.0; + << qreal(0.0); QTest::newRow("1/1") - << 1.0; + << qreal(1.0); QTest::newRow("24/1") - << 24.0; + << qreal(24.0); QTest::newRow("15/2") - << 7.5; + << qreal(7.5); } void tst_QVideoSurfaceFormat::frameRate() @@ -583,7 +583,7 @@ void tst_QVideoSurfaceFormat::compare() QCOMPARE(format1 == format2, false); QCOMPARE(format1 != format2, true); - format2.setFrameRate(7.50001); + format2.setFrameRate(qreal(7.50001)); // Equal. QCOMPARE(format1 == format2, true); |