qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix MSVC-warnings about double to float truncation in QML-tests. 

Change-Id: Ie58585ca3555f0f7808b59221a00763cc702863a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Friedemann Kleint 2014-01-24 15:16:10 +01:00 committed by The Qt Project
parent 1849f7e34d
commit c6d90f47b9
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
View File

@ -384,7 +384,7 @@ void tst_qqmlecmascript::assignBasicTypes()
QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
QCOMPARE(object->boolProperty(), true);
QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2f));
QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
delete object;
}
@ -413,7 +413,7 @@ void tst_qqmlecmascript::assignBasicTypes()
QCOMPARE(object->rectFProperty(), QRectF(1000.1, -10.9, 400, 90.99));
QCOMPARE(object->boolProperty(), true);
QCOMPARE(object->variantProperty(), QVariant("Hello World!"));
QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2));
QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2f));
QCOMPARE(object->urlProperty(), component.url().resolved(QUrl("main.qml")));
delete object;
}

8
tests/auto/qml/qqmlvaluetypeproviders/testtypes.h
View File

@ -91,10 +91,10 @@ public:
m_rect(2, 3, 109, 102),
m_rectf(103.8, 99.2, 88.1, 77.6),
m_rectfrect(2.0, 3.0, 109.0, 102.0),
m_vector2(32.88, 1.3),
m_vector(23.88, 3.1, 4.3),
m_vector4(54.2, 23.88, 3.1, 4.3),
m_quaternion(4.3, 54.2, 23.88, 3.1),
m_vector2(32.88f, 1.3f),
m_vector(23.88f, 3.1f, 4.3f),
m_vector4(54.2f, 23.88f, 3.1f, 4.3f),
m_quaternion(4.3f, 54.2f, 23.88f, 3.1f),
m_matrix(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
{
m_font.setFamily("Arial");

8
tests/auto/qml/qqmlvaluetypes/testtypes.h
View File

@ -95,10 +95,10 @@ public:
m_rect(2, 3, 109, 102),
m_rectf(103.8, 99.2, 88.1, 77.6),
m_rectfrect(2.0, 3.0, 109.0, 102.0),
m_vector2(32.88, 1.3),
m_vector(23.88, 3.1, 4.3),
m_vector4(54.2, 23.88, 3.1, 4.3),
m_quaternion(4.3, 54.2, 23.88, 3.1),
m_vector2(32.88f, 1.3f),
m_vector(23.88f, 3.1f, 4.3f),
m_vector4(54.2f, 23.88f, 3.1f, 4.3f),
m_quaternion(4.3f, 54.2f, 23.88f, 3.1f),
m_matrix(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
{
m_font.setFamily("Arial");

24
tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp
View File

@ -468,7 +468,7 @@ void tst_qqmlvaluetypes::vector2d()
QCOMPARE((float)object->property("v_x").toDouble(), (float)32.88);
QCOMPARE((float)object->property("v_y").toDouble(), (float)1.3);
QCOMPARE(object->property("copy"), QVariant(QVector2D(32.88, 1.3)));
QCOMPARE(object->property("copy"), QVariant(QVector2D(32.88f, 1.3f)));
delete object;
}
@ -478,7 +478,7 @@ void tst_qqmlvaluetypes::vector2d()
MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->vector2(), QVector2D(-0.3, -12.9));
QCOMPARE(object->vector2(), QVector2D(-0.3f, -12.9f));
delete object;
}
@ -520,7 +520,7 @@ void tst_qqmlvaluetypes::vector3d()
QCOMPARE((float)object->property("v_x").toDouble(), (float)23.88);
QCOMPARE((float)object->property("v_y").toDouble(), (float)3.1);
QCOMPARE((float)object->property("v_z").toDouble(), (float)4.3);
QCOMPARE(object->property("copy"), QVariant(QVector3D(23.88, 3.1, 4.3)));
QCOMPARE(object->property("copy"), QVariant(QVector3D(23.88f, 3.1f, 4.3f)));
delete object;
}
@ -530,7 +530,7 @@ void tst_qqmlvaluetypes::vector3d()
MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->vector(), QVector3D(-0.3, -12.9, 907.4));
QCOMPARE(object->vector(), QVector3D(-0.3f, -12.9f, 907.4f));
delete object;
}
@ -574,7 +574,7 @@ void tst_qqmlvaluetypes::vector4d()
QCOMPARE((float)object->property("v_y").toDouble(), (float)23.88);
QCOMPARE((float)object->property("v_z").toDouble(), (float)3.1);
QCOMPARE((float)object->property("v_w").toDouble(), (float)4.3);
QCOMPARE(object->property("copy"), QVariant(QVector4D(54.2, 23.88, 3.1, 4.3)));
QCOMPARE(object->property("copy"), QVariant(QVector4D(54.2f, 23.88f, 3.1f, 4.3f)));
delete object;
}
@ -584,7 +584,7 @@ void tst_qqmlvaluetypes::vector4d()
MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->vector4(), QVector4D(-0.3, -12.9, 907.4, 88.5));
QCOMPARE(object->vector4(), QVector4D(-0.3f, -12.9f, 907.4f, 88.5f));
delete object;
}
@ -627,7 +627,7 @@ void tst_qqmlvaluetypes::quaternion()
QCOMPARE((float)object->property("v_x").toDouble(), (float)54.2);
QCOMPARE((float)object->property("v_y").toDouble(), (float)23.88);
QCOMPARE((float)object->property("v_z").toDouble(), (float)3.1);
QCOMPARE(object->property("copy"), QVariant(QQuaternion(4.3, 54.2, 23.88, 3.1)));
QCOMPARE(object->property("copy"), QVariant(QQuaternion(4.3f, 54.2f, 23.88f, 3.1f)));
delete object;
}
@ -637,7 +637,7 @@ void tst_qqmlvaluetypes::quaternion()
MyTypeObject *object = qobject_cast<MyTypeObject *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->quaternion(), QQuaternion(88.5, -0.3, -12.9, 907.4));
QCOMPARE(object->quaternion(), QQuaternion(88.5f, -0.3f, -12.9f, 907.4f));
delete object;
}
@ -1184,10 +1184,10 @@ void tst_qqmlvaluetypes::cppClasses()
CPP_TEST(QQmlSizeFValueType, QSizeF(-100.7, 18.2));
CPP_TEST(QQmlRectValueType, QRect(13, 39, 10928, 88));
CPP_TEST(QQmlRectFValueType, QRectF(88.2, -90.1, 103.2, 118));
CPP_TEST(QQuickVector2DValueType, QVector2D(19.7, 1002));
CPP_TEST(QQuickVector3DValueType, QVector3D(18.2, 19.7, 1002));
CPP_TEST(QQuickVector4DValueType, QVector4D(18.2, 19.7, 1002, 54));
CPP_TEST(QQuickQuaternionValueType, QQuaternion(18.2, 19.7, 1002, 54));
CPP_TEST(QQuickVector2DValueType, QVector2D(19.7f, 1002));
CPP_TEST(QQuickVector3DValueType, QVector3D(18.2f, 19.7f, 1002));
CPP_TEST(QQuickVector4DValueType, QVector4D(18.2f, 19.7f, 1002, 54));
CPP_TEST(QQuickQuaternionValueType, QQuaternion(18.2f, 19.7f, 1002, 54));
CPP_TEST(QQuickMatrix4x4ValueType,
QMatrix4x4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16));
CPP_TEST(QQuickFontValueType, QFont("Helvetica"));