diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-01-24 15:34:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-24 20:26:39 +0100 |
| commit | 1fb42377a2a7f39ad0d3d0fd3b88941198553db6 (patch) | |
| tree | ecb69c68df37c21a87311cb6f2adc76c8ea70944 /tests/auto/gui | |
| parent | 558ae43b1b4447d4b8ee2275b4afa88b9143604a (diff) | |
Fix MSVC-warnings about double to float truncation.
Change-Id: I4aef12bd8fe37dffb06fc7d0b6a330bfc42fa270
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/kernel/qguivariant/test/tst_qguivariant.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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<QVector3D>(variant); QVERIFY(vector.isNull()); - variant.setValue(QVector3D(0.1, 0.2, 0.3)); - QCOMPARE(QVector3D(0.1, 0.2, 0.3), qvariant_cast<QVector3D>(variant)); + variant.setValue(QVector3D(0.1f, 0.2f, 0.3f)); + QCOMPARE(QVector3D(0.1f, 0.2f, 0.3f), qvariant_cast<QVector3D>(variant)); void *pvector = QMetaType::create(QVariant::Vector3D, 0); QVERIFY(pvector); @@ -481,8 +481,8 @@ void tst_QGuiVariant::vector4D() QVariant variant; QVector4D vector = qvariant_cast<QVector4D>(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<QVector4D>(variant)); + variant.setValue(QVector4D(0.1f, 0.2f, 0.3f, 0.4f)); + QCOMPARE(QVector4D(0.1f, 0.2f, 0.3f, 0.4f), qvariant_cast<QVector4D>(variant)); void *pvector = QMetaType::create(QVariant::Vector4D, 0); QVERIFY(pvector); @@ -494,8 +494,8 @@ void tst_QGuiVariant::quaternion() QVariant variant; QQuaternion quaternion = qvariant_cast<QQuaternion>(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<QQuaternion>(variant)); + variant.setValue(QQuaternion(0.1f, 0.2f, 0.3f, 0.4f)); + QCOMPARE(QQuaternion(0.1f, 0.2f, 0.3f, 0.4f), qvariant_cast<QQuaternion>(variant)); void *pquaternion = QMetaType::create(QVariant::Quaternion, 0); QVERIFY(pquaternion); |