summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-11-12 11:13:03 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-11-12 11:13:03 (GMT)
commit3f867b487ac1642ce3ae442e2dbbbf56029290cd (patch)
tree017b8531988f5a3ed6e7f2041b3da4e32ecbe705 /tests
parent4e37815e7e3c68ff561ead147cb06898a2db9c75 (diff)
downloadQt-3f867b487ac1642ce3ae442e2dbbbf56029290cd.zip
Qt-3f867b487ac1642ce3ae442e2dbbbf56029290cd.tar.gz
Qt-3f867b487ac1642ce3ae442e2dbbbf56029290cd.tar.bz2
fix tst_QVideoSurfaceFormat for the qreal == float case
Reviewed-by: thartman
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qvideosurfaceformat/tst_qvideosurfaceformat.cpp10
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);