From 1fb42377a2a7f39ad0d3d0fd3b88941198553db6 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Jan 2014 15:34:54 +0100 Subject: Fix MSVC-warnings about double to float truncation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4aef12bd8fe37dffb06fc7d0b6a330bfc42fa270 Reviewed-by: Jędrzej Nowacki --- tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp | 2 +- tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp index 3348b49110..3f46b92ec9 100644 --- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp +++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp @@ -756,7 +756,7 @@ void tst_QEasingCurve::testCbrtDouble() void tst_QEasingCurve::testCbrtFloat() { - const float errorBound = 0.0005; + const float errorBound = 0.0005f; for (int i = 0; i < 100000; i++) { float f = float(i) / 1000.0f; diff --git a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp index 336564bc59..431db86330 100644 --- a/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp +++ b/tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp @@ -468,8 +468,8 @@ void tst_QGuiVariant::vector3D() QVariant variant; QVector3D vector = qvariant_cast(variant); QVERIFY(vector.isNull()); - variant.setValue(QVector3D(0.1, 0.2, 0.3)); - QCOMPARE(QVector3D(0.1, 0.2, 0.3), qvariant_cast(variant)); + variant.setValue(QVector3D(0.1f, 0.2f, 0.3f)); + QCOMPARE(QVector3D(0.1f, 0.2f, 0.3f), qvariant_cast(variant)); void *pvector = QMetaType::create(QVariant::Vector3D, 0); QVERIFY(pvector); @@ -481,8 +481,8 @@ void tst_QGuiVariant::vector4D() QVariant variant; QVector4D vector = qvariant_cast(variant); QVERIFY(vector.isNull()); - variant.setValue(QVector4D(0.1, 0.2, 0.3, 0.4)); - QCOMPARE(QVector4D(0.1, 0.2, 0.3, 0.4), qvariant_cast(variant)); + variant.setValue(QVector4D(0.1f, 0.2f, 0.3f, 0.4f)); + QCOMPARE(QVector4D(0.1f, 0.2f, 0.3f, 0.4f), qvariant_cast(variant)); void *pvector = QMetaType::create(QVariant::Vector4D, 0); QVERIFY(pvector); @@ -494,8 +494,8 @@ void tst_QGuiVariant::quaternion() QVariant variant; QQuaternion quaternion = qvariant_cast(variant); QVERIFY(quaternion.isIdentity()); - variant.setValue(QQuaternion(0.1, 0.2, 0.3, 0.4)); - QCOMPARE(QQuaternion(0.1, 0.2, 0.3, 0.4), qvariant_cast(variant)); + variant.setValue(QQuaternion(0.1f, 0.2f, 0.3f, 0.4f)); + QCOMPARE(QQuaternion(0.1f, 0.2f, 0.3f, 0.4f), qvariant_cast(variant)); void *pquaternion = QMetaType::create(QVariant::Quaternion, 0); QVERIFY(pquaternion); -- cgit v1.2.3