Fix double to float truncation warnings

QVectorND and QQuarternion operates on floats, so pass in float literals
rather than doubles.

Pick-to: 6.1
Change-Id: I6ddb6a4f0caa6e8687e718e10957b6c939a091bd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

5 files changed, 48 insertions, 48 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);
 }
diff --git a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
index 65505b23..495b8ba8 100644
--- a/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
+++ b/tests/auto/cpptest/q3dcustom-volume/tst_custom.cpp
@@ -80,8 +80,8 @@ void tst_custom::construct()
     QList<QRgb> table;
     table << QRgb(0xff00ff) << QRgb(0x00ff00);
 
-    custom = new QCustom3DVolume(QVector3D(1.0, 1.0, 1.0), QVector3D(1.0, 1.0, 1.0),
-                                 QQuaternion(1.0, 1.0, 10.0, 100.0), 10, 10, 10,
+    custom = new QCustom3DVolume(QVector3D(1.0f, 1.0f, 1.0f), QVector3D(1.0f, 1.0f, 1.0f),
+                                 QQuaternion(1.0f, 1.0f, 10.0f, 100.0f), 10, 10, 10,
                                  tdata, QImage::Format_ARGB32, table);
     QVERIFY(custom);
     QCOMPARE(custom->alphaMultiplier(), 1.0f);
@@ -103,10 +103,10 @@ void tst_custom::construct()
     QCOMPARE(custom->textureWidth(), 10);
     QCOMPARE(custom->textureDepth(), 10);
     QCOMPARE(custom->meshFile(), QString(":/defaultMeshes/barFull"));
-    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());
@@ -174,18 +174,18 @@ void tst_custom::initializeProperties()
     QCOMPARE(m_custom->useHighDefShader(), false);
 
     // Common (from QCustom3DVolume)
-    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->setScalingAbsolute(false);
     m_custom->setShadowCasting(false);
     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->isScalingAbsolute(), false);
     QCOMPARE(m_custom->isShadowCasting(), false);
     QCOMPARE(m_custom->isVisible(), false);
diff --git a/tests/auto/cpptest/q3dcustom/tst_custom.cpp b/tests/auto/cpptest/q3dcustom/tst_custom.cpp
index 39794c35..19607431 100644
--- a/tests/auto/cpptest/q3dcustom/tst_custom.cpp
+++ b/tests/auto/cpptest/q3dcustom/tst_custom.cpp
@@ -74,15 +74,15 @@ void tst_custom::construct()
     QVERIFY(custom);
     delete custom;
 
-    custom = new QCustom3DItem(":/customitem.obj", 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 QCustom3DItem(":/customitem.obj", QVector3D(1.0f, 1.0f, 1.0f),
+                               QVector3D(1.0f, 1.0f, 1.0f), QQuaternion(1.0f, 1.0f, 10.0f, 100.0f),
                                QImage(":/customtexture.jpg"));
     QVERIFY(custom);
     QCOMPARE(custom->meshFile(), QString(":/customitem.obj"));
-    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(), true);
     QCOMPARE(custom->textureFile(), QString());
@@ -110,20 +110,20 @@ void tst_custom::initializeProperties()
     QVERIFY(m_custom);
 
     m_custom->setMeshFile(":/customitem.obj");
-    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->setScalingAbsolute(false);
     m_custom->setShadowCasting(false);
     m_custom->setTextureFile(":/customtexture.jpg");
     m_custom->setVisible(false);
 
     QCOMPARE(m_custom->meshFile(), QString(":/customitem.obj"));
-    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->isScalingAbsolute(), false);
     QCOMPARE(m_custom->isShadowCasting(), false);
     QCOMPARE(m_custom->textureFile(), QString(":/customtexture.jpg"));
diff --git a/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp b/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp
index 2925956d..dbfb1367 100644
--- a/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp
+++ b/tests/auto/cpptest/q3dscene-camera/tst_camera.cpp
@@ -85,7 +85,7 @@ void tst_camera::initialProperties()
     QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone);
     QCOMPARE(m_camera->maxZoomLevel(), 500.0f);
     QCOMPARE(m_camera->minZoomLevel(), 10.0f);
-    QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0));
+    QCOMPARE(m_camera->target(), QVector3D(0.0f, 0.0f, 0.0f));
     QCOMPARE(m_camera->wrapXRotation(), true);
     QCOMPARE(m_camera->wrapYRotation(), false);
     QCOMPARE(m_camera->xRotation(), 0.0f);
@@ -103,7 +103,7 @@ void tst_camera::initializeProperties()
 
     m_camera->setMaxZoomLevel(1000.0f);
     m_camera->setMinZoomLevel(100.0f);
-    m_camera->setTarget(QVector3D(1.0, -1.0, 1.0));
+    m_camera->setTarget(QVector3D(1.0f, -1.0f, 1.0f));
     m_camera->setWrapXRotation(false);
     m_camera->setWrapYRotation(true);
     m_camera->setXRotation(30.0f);
@@ -112,26 +112,26 @@ void tst_camera::initializeProperties()
 
     QCOMPARE(m_camera->maxZoomLevel(), 1000.0f);
     QCOMPARE(m_camera->minZoomLevel(), 100.0f);
-    QCOMPARE(m_camera->target(), QVector3D(1.0, -1.0, 1.0));
+    QCOMPARE(m_camera->target(), QVector3D(1.0f, -1.0f, 1.0f));
     QCOMPARE(m_camera->wrapXRotation(), false);
     QCOMPARE(m_camera->wrapYRotation(), true);
     QCOMPARE(m_camera->xRotation(), 30.0f);
     QCOMPARE(m_camera->yRotation(), 30.0f);
     QCOMPARE(m_camera->zoomLevel(), 500.0f);
 
-    m_camera->setPosition(QVector3D(1.0, 1.0, 1.0));
+    m_camera->setPosition(QVector3D(1.0f, 1.0f, 1.0f));
 
     // Common (from Q3DObject)
-    QCOMPARE(m_camera->position(), QVector3D(1.0, 1.0, 1.0));
+    QCOMPARE(m_camera->position(), QVector3D(1.0f, 1.0f, 1.0f));
 }
 
 void tst_camera::invalidProperties()
 {
-    m_camera->setTarget(QVector3D(-1.5, -1.5, -1.5));
-    QCOMPARE(m_camera->target(), QVector3D(-1.0, -1.0, -1.0));
+    m_camera->setTarget(QVector3D(-1.5f, -1.5f, -1.5f));
+    QCOMPARE(m_camera->target(), QVector3D(-1.0f, -1.0f, -1.0f));
 
-    m_camera->setTarget(QVector3D(1.5, 1.5, 1.5));
-    QCOMPARE(m_camera->target(), QVector3D(1.0, 1.0, 1.0));
+    m_camera->setTarget(QVector3D(1.5f, 1.5f, 1.5f));
+    QCOMPARE(m_camera->target(), QVector3D(1.0f, 1.0f, 1.0f));
 
     m_camera->setMinZoomLevel(0.1f);
     QCOMPARE(m_camera->minZoomLevel(), 1.0f);
@@ -142,7 +142,7 @@ void tst_camera::changePresets()
     m_camera->setCameraPreset(Q3DCamera::CameraPresetBehind); // Will be overridden by the the following sets
     m_camera->setMaxZoomLevel(1000.0f);
     m_camera->setMinZoomLevel(100.0f);
-    m_camera->setTarget(QVector3D(1.0, -1.0, 1.0));
+    m_camera->setTarget(QVector3D(1.0f, -1.0f, 1.0f));
     m_camera->setWrapXRotation(false);
     m_camera->setWrapYRotation(true);
     m_camera->setXRotation(30.0f);
@@ -152,7 +152,7 @@ void tst_camera::changePresets()
     QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone);
     QCOMPARE(m_camera->maxZoomLevel(), 1000.0f);
     QCOMPARE(m_camera->minZoomLevel(), 100.0f);
-    QCOMPARE(m_camera->target(), QVector3D(1.0, -1.0, 1.0));
+    QCOMPARE(m_camera->target(), QVector3D(1.0f, -1.0f, 1.0f));
     QCOMPARE(m_camera->wrapXRotation(), false);
     QCOMPARE(m_camera->wrapYRotation(), true);
     QCOMPARE(m_camera->xRotation(), 30.0f);
@@ -164,7 +164,7 @@ void tst_camera::changePresets()
     QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetBehind);
     QCOMPARE(m_camera->maxZoomLevel(), 1000.0f);
     QCOMPARE(m_camera->minZoomLevel(), 100.0f);
-    QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0));
+    QCOMPARE(m_camera->target(), QVector3D(0.0f, 0.0f, 0.0f));
     QCOMPARE(m_camera->wrapXRotation(), false);
     QCOMPARE(m_camera->wrapYRotation(), true);
     QCOMPARE(m_camera->xRotation(), 180.0f);
@@ -176,7 +176,7 @@ void tst_camera::changePresets()
     QCOMPARE(m_camera->cameraPreset(), Q3DCamera::CameraPresetNone);
     QCOMPARE(m_camera->maxZoomLevel(), 1000.0f);
     QCOMPARE(m_camera->minZoomLevel(), 100.0f);
-    QCOMPARE(m_camera->target(), QVector3D(0.0, 0.0, 0.0));
+    QCOMPARE(m_camera->target(), QVector3D(0.0f, 0.0f, 0.0f));
     QCOMPARE(m_camera->wrapXRotation(), false);
     QCOMPARE(m_camera->wrapYRotation(), true);
     QCOMPARE(m_camera->xRotation(), 10.0f);
diff --git a/tests/auto/cpptest/q3dscene-light/tst_light.cpp b/tests/auto/cpptest/q3dscene-light/tst_light.cpp
index 6246ab01..a02ee1ed 100644
--- a/tests/auto/cpptest/q3dscene-light/tst_light.cpp
+++ b/tests/auto/cpptest/q3dscene-light/tst_light.cpp
@@ -94,8 +94,8 @@ void tst_light::initializeProperties()
     QCOMPARE(m_light->isAutoPosition(), true);
 
     // Common (from Q3DObject)
-    m_light->setPosition(QVector3D(1.0, 1.0, 1.0));
-    QCOMPARE(m_light->position(), QVector3D(1.0, 1.0, 1.0));
+    m_light->setPosition(QVector3D(1.0f, 1.0f, 1.0f));
+    QCOMPARE(m_light->position(), QVector3D(1.0f, 1.0f, 1.0f));
 }
 
 QTEST_MAIN(tst_light)