4 files changed, 15 insertions, 15 deletions
diff --git a/tests/auto/core/handlemanager/tst_handlemanager.cpp b/tests/auto/core/handlemanager/tst_handlemanager.cpp
index 3198b54a9..f4879a3df 100644
--- a/tests/auto/core/handlemanager/tst_handlemanager.cpp
+++ b/tests/auto/core/handlemanager/tst_handlemanager.cpp
@@ -75,7 +75,7 @@ void tst_HandleManager::correctPointer()
 {
     // GIVEN
     Qt3DCore::QHandleManager<SimpleResource> manager;
-    SimpleResource *p1 = (SimpleResource *)0xdeadbeef;
+    SimpleResource *p1 = (SimpleResource *)(quintptr)0xdeadbeef;
 
     // WHEN
     const Handle h = manager.acquire(p1);
@@ -93,9 +93,9 @@ void tst_HandleManager::correctPointers()
     // GIVEN
     Qt3DCore::QHandleManager<SimpleResource> manager;
     SimpleResource *p[3];
-    p[0] = (SimpleResource *)0xdeadbeef;
-    p[1] = (SimpleResource *)0x11111111;
-    p[2] = (SimpleResource *)0x22222222;
+    p[0] = (SimpleResource *)(quintptr)0xdeadbeef;
+    p[1] = (SimpleResource *)(quintptr)0x11111111;
+    p[2] = (SimpleResource *)(quintptr)0x22222222;
 
     // WHEN
     for (int i = 0; i < 3; ++i) {
@@ -211,7 +211,7 @@ void tst_HandleManager::resetRemovesAllEntries()
 
     // WHEN
     for (int i = 0; i < 100; ++i) {
-        SimpleResource *p = (SimpleResource *) 0xdead0000 + i;
+        SimpleResource *p = (SimpleResource *)(quintptr)(0xdead0000 + i);
         const Handle h = manager.acquire(p);
 
         bool ok = false;
@@ -240,7 +240,7 @@ void tst_HandleManager::maximumEntries()
 
     // WHEN
     for (int i = 0; i < (int)Handle::maxIndex(); ++i) {
-        SimpleResource *p = (SimpleResource *) 0xdead0000 + i;
+        SimpleResource *p = (SimpleResource *)(quintptr)(0xdead0000 + i);
         const Handle h = manager.acquire(p);
 
         bool ok = false;
@@ -264,7 +264,7 @@ void tst_HandleManager::checkNoCounterOverflow()
     // GIVEN
     const int indexBits = 16;
     Qt3DCore::QHandleManager<SimpleResource, indexBits> manager;
-    SimpleResource *p = (SimpleResource *) 0xdead0000;
+    SimpleResource *p = (SimpleResource *)(quintptr)0xdead0000;
     Qt3DCore::QHandle<SimpleResource, indexBits> h = manager.acquire(p);
 
     // THEN
diff --git a/tests/auto/core/nodes/tst_nodes.cpp b/tests/auto/core/nodes/tst_nodes.cpp
index 695a93640..c221c5115 100644
--- a/tests/auto/core/nodes/tst_nodes.cpp
+++ b/tests/auto/core/nodes/tst_nodes.cpp
@@ -130,7 +130,7 @@ public:
 
     void sceneChangeEventWithLock(const Qt3DCore::QSceneChangeList &e) Q_DECL_OVERRIDE
     {
-        for (uint i = 0, m = e.size(); i < m; ++i) {
+        for (size_t i = 0, m = e.size(); i < m; ++i) {
             events << ChangeRecord(e.at(i), false);
         }
     }
diff --git a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
index 76d4d15ce..a098792ee 100644
--- a/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
+++ b/tests/auto/core/qframeallocator/tst_qframeallocator.cpp
@@ -294,8 +294,8 @@ void tst_QFrameAllocator::containsCheckQFrameChunk()
         ptrs << c.allocate(16);
     }
 
-    QVERIFY(!c.contains((void *)0xffffffff, 16));
-    QVERIFY(!c2.contains((void *)0xffffffff, 16));
+    QVERIFY(!c.contains((void *)(quintptr)0xffffffff, 16));
+    QVERIFY(!c2.contains((void *)(quintptr)0xffffffff, 16));
     QVERIFY(c.contains(ptrs.first(), 16));
     QVERIFY(!c2.contains(ptrs.first(), 16));
     QVERIFY(c.contains(ptrs.last(), 16));
@@ -305,7 +305,7 @@ void tst_QFrameAllocator::containsCheckQFrameChunk()
         ptrs << c2.allocate(16);
     }
 
-    QVERIFY(!c.contains((void *)0xffffffff, 16));
+    QVERIFY(!c.contains((void *)(quintptr)0xffffffff, 16));
     QVERIFY(!c.contains(ptrs.last(), 16));
     QVERIFY(c.contains(ptrs.first(), 16));
     QVERIFY(c2.contains(ptrs.last(), 16));
diff --git a/tests/auto/core/qtransform/tst_qtransform.cpp b/tests/auto/core/qtransform/tst_qtransform.cpp
index ee63255b8..f5527ebf5 100644
--- a/tests/auto/core/qtransform/tst_qtransform.cpp
+++ b/tests/auto/core/qtransform/tst_qtransform.cpp
@@ -66,15 +66,15 @@ private Q_SLOTS:
         QTest::newRow("defaultConstructed") << defaultConstructed;
 
         Qt3DCore::QTransform *matrixPropertySet = new Qt3DCore::QTransform();
-        matrixPropertySet->setMatrix(Qt3DCore::QTransform::rotateAround(QVector3D(0.1877, 0.6868, 0.3884), 45.0, QVector3D(0, 0, 1)));
+        matrixPropertySet->setMatrix(Qt3DCore::QTransform::rotateAround(QVector3D(0.1877f, 0.6868f, 0.3884f), 45.0f, QVector3D(0.0f, 0.0f, 1.0f)));
         QTest::newRow("matrixPropertySet") << matrixPropertySet;
 
         Qt3DCore::QTransform *translationSet = new Qt3DCore::QTransform();
-        translationSet->setTranslation(QVector3D(0.1877, 0.6868, 0.3884));
+        translationSet->setTranslation(QVector3D(0.1877f, 0.6868f, 0.3884f));
         QTest::newRow("translationSet") << translationSet;
 
         Qt3DCore::QTransform *scaleSet = new Qt3DCore::QTransform();
-        scaleSet->setScale3D(QVector3D(0.1, 0.6, 0.3));
+        scaleSet->setScale3D(QVector3D(0.1f, 0.6f, 0.3f));
         QTest::newRow("scaleSet") << scaleSet;
 
         Qt3DCore::QTransform *rotationSet = new Qt3DCore::QTransform();
@@ -326,7 +326,7 @@ private Q_SLOTS:
         // GIVEN
         Qt3DCore::QTransform t;
         Qt3DCore::QTransform t2;
-        QMatrix4x4 m = Qt3DCore::QTransform::rotateAround(QVector3D(0.1877, 0.6868, 0.3884), 45.0, QVector3D(0, 0, 1));
+        QMatrix4x4 m = Qt3DCore::QTransform::rotateAround(QVector3D(0.1877f, 0.6868f, 0.3884f), 45.0f, QVector3D(0.0f, 0.0f, 1.0f));
 
         // WHEN
         t.setMatrix(m);