diff options
Diffstat (limited to 'tests/auto/cpptest/q3dcustom-label/tst_custom.cpp')
-rw-r--r-- | tests/auto/cpptest/q3dcustom-label/tst_custom.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp b/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp index 31a302e3..4b6b3e5b 100644 --- a/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp +++ b/tests/auto/cpptest/q3dcustom-label/tst_custom.cpp @@ -79,8 +79,8 @@ void tst_custom::construct() QVERIFY(custom); delete custom; - custom = new QCustom3DLabel("label", QFont("Times New Roman", 10.0), QVector3D(1.0, 1.0, 1.0), - QVector3D(1.0, 1.0, 1.0), QQuaternion(1.0, 1.0, 10.0, 100.0)); + custom = new QCustom3DLabel("label", QFont("Times New Roman", 10.0), QVector3D(1.0f, 1.0f, 1.0f), + QVector3D(1.0f, 1.0f, 1.0f), QQuaternion(1.0f, 1.0f, 10.0f, 100.0f)); QVERIFY(custom); QCOMPARE(custom->backgroundColor(), QColor(Qt::gray)); QCOMPARE(custom->isBackgroundEnabled(), true); @@ -90,10 +90,10 @@ void tst_custom::construct() QCOMPARE(custom->text(), QString("label")); QCOMPARE(custom->textColor(), QColor(Qt::white)); QCOMPARE(custom->meshFile(), QString(":/defaultMeshes/plane")); - QCOMPARE(custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->position(), QVector3D(1.0f, 1.0f, 1.0f)); QCOMPARE(custom->isPositionAbsolute(), false); - QCOMPARE(custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); - QCOMPARE(custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(custom->rotation(), QQuaternion(1.0f, 1.0f, 10.0f, 100.0f)); + QCOMPARE(custom->scaling(), QVector3D(1.0f, 1.0f, 1.0f)); QCOMPARE(custom->isScalingAbsolute(), true); QCOMPARE(custom->isShadowCasting(), false); QCOMPARE(custom->textureFile(), QString()); @@ -146,17 +146,17 @@ void tst_custom::initializeProperties() QCOMPARE(m_custom->textColor(), QColor(Qt::blue)); // Common (from QCustom3DItem) - m_custom->setPosition(QVector3D(1.0, 1.0, 1.0)); + m_custom->setPosition(QVector3D(1.0f, 1.0f, 1.0f)); m_custom->setPositionAbsolute(true); - m_custom->setRotation(QQuaternion(1.0, 1.0, 10.0, 100.0)); - m_custom->setScaling(QVector3D(1.0, 1.0, 1.0)); + m_custom->setRotation(QQuaternion(1.0f, 1.0f, 10.0f, 100.0f)); + m_custom->setScaling(QVector3D(1.0f, 1.0f, 1.0f)); m_custom->setShadowCasting(true); m_custom->setVisible(false); - QCOMPARE(m_custom->position(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->position(), QVector3D(1.0f, 1.0f, 1.0f)); QCOMPARE(m_custom->isPositionAbsolute(), true); - QCOMPARE(m_custom->rotation(), QQuaternion(1.0, 1.0, 10.0, 100.0)); - QCOMPARE(m_custom->scaling(), QVector3D(1.0, 1.0, 1.0)); + QCOMPARE(m_custom->rotation(), QQuaternion(1.0f, 1.0f, 10.0f, 100.0f)); + QCOMPARE(m_custom->scaling(), QVector3D(1.0f, 1.0f, 1.0f)); QCOMPARE(m_custom->isShadowCasting(), true); QCOMPARE(m_custom->isVisible(), false); } |