diff options
Diffstat (limited to 'tests/auto/declarative/qdeclarativevaluetypes')
5 files changed, 19 insertions, 19 deletions
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml index e2e69627..666dd165 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml +++ b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.1.qml @@ -10,7 +10,7 @@ Rectangle { property int myPixelSize: 12 property int myPixelSize2: 24 - + Text { id: other font.pixelSize: 6 diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml index 0e09ff95..b7eb04a9 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml +++ b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.2.qml @@ -10,7 +10,7 @@ Rectangle { property int myPixelSize: 12 property int myPixelSize2: 24 - + Text { id: other font.pixelSize: 6 diff --git a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml index 1f6646ea..1788f6dd 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml +++ b/tests/auto/declarative/qdeclarativevaluetypes/data/conflicting.3.qml @@ -10,7 +10,7 @@ Rectangle { property int myPixelSize: 12 property int myPixelSize2: 24 - + Text { id: other font.pixelSize: 6 diff --git a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h index f0c752ce..3347a264 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h +++ b/tests/auto/declarative/qdeclarativevaluetypes/testtypes.h @@ -86,10 +86,10 @@ public: m_sizef(0.1, 100923.2), m_rect(2, 3, 109, 102), m_rectf(103.8, 99.2, 88.1, 77.6), - 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"); diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp index 740e1dcb..860069b8 100644 --- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp +++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp @@ -323,7 +323,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -333,7 +333,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -349,7 +349,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -359,7 +359,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -376,7 +376,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -386,7 +386,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -403,7 +403,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -413,7 +413,7 @@ void tst_qdeclarativevaluetypes::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; } @@ -811,10 +811,10 @@ void tst_qdeclarativevaluetypes::cppClasses() CPP_TEST(QDeclarativeSizeFValueType, QSizeF(-100.7, 18.2)); CPP_TEST(QDeclarativeRectValueType, QRect(13, 39, 10928, 88)); CPP_TEST(QDeclarativeRectFValueType, QRectF(88.2, -90.1, 103.2, 118)); - CPP_TEST(QDeclarativeVector2DValueType, QVector2D(19.7, 1002)); - CPP_TEST(QDeclarativeVector3DValueType, QVector3D(18.2, 19.7, 1002)); - CPP_TEST(QDeclarativeVector4DValueType, QVector4D(18.2, 19.7, 1002, 54)); - CPP_TEST(QDeclarativeQuaternionValueType, QQuaternion(18.2, 19.7, 1002, 54)); + CPP_TEST(QDeclarativeVector2DValueType, QVector2D(19.7f, 1002)); + CPP_TEST(QDeclarativeVector3DValueType, QVector3D(18.2f, 19.7f, 1002)); + CPP_TEST(QDeclarativeVector4DValueType, QVector4D(18.2f, 19.7f, 1002, 54)); + CPP_TEST(QDeclarativeQuaternionValueType, QQuaternion(18.2f, 19.7f, 1002, 54)); CPP_TEST(QDeclarativeMatrix4x4ValueType, QMatrix4x4(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); CPP_TEST(QDeclarativeFontValueType, QFont("Helvetica")); |