7 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 6b18e1ab03..d016f07522 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -1128,7 +1128,7 @@ void QMatrix4x4::rotate(float angle, float x, float y, float z)
         s = 0.0f;
         c = -1.0f;
     } else {
-        float a = angle * M_PI / 180.0f;
+        float a = qDegreesToRadians(angle);
         c = std::cos(a);
         s = std::sin(a);
     }
@@ -1237,7 +1237,7 @@ void QMatrix4x4::projectedRotate(float angle, float x, float y, float z)
         s = 0.0f;
         c = -1.0f;
     } else {
-        float a = angle * M_PI / 180.0f;
+        float a = qDegreesToRadians(angle);
         c = std::cos(a);
         s = std::sin(a);
     }
@@ -1496,7 +1496,7 @@ void QMatrix4x4::perspective(float verticalAngle, float aspectRatio, float nearP
 
     // Construct the projection.
     QMatrix4x4 m(1);
-    float radians = (verticalAngle / 2.0f) * M_PI / 180.0f;
+    float radians = qDegreesToRadians(verticalAngle / 2.0f);
     float sine = std::sin(radians);
     if (sine == 0.0f)
         return;
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 4db96d07c0..97df11a8bd 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -859,8 +859,8 @@ inline QPointF operator*(const QPointF& point, const QMatrix4x4& matrix)
 {
     float xin, yin;
     float x, y, w;
-    xin = point.x();
-    yin = point.y();
+    xin = float(point.x());
+    yin = float(point.y());
     x = xin * matrix.m[0][0] +
         yin * matrix.m[0][1] +
         matrix.m[0][3];
@@ -1094,7 +1094,7 @@ inline float *QMatrix4x4::data()
 
 inline void QMatrix4x4::viewport(const QRectF &rect)
 {
-    viewport(rect.x(), rect.y(), rect.width(), rect.height());
+    viewport(float(rect.x()), float(rect.y()), float(rect.width()), float(rect.height()));
 }
 
 QT_WARNING_POP
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index e3262c8830..fe1b0425a8 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -408,7 +408,7 @@ QQuaternion QQuaternion::fromAxisAndAngle(const QVector3D& axis, float angle)
     // http://www.j3d.org/matrix_faq/matrfaq_latest.html#Q56
     // We normalize the result just in case the values are close
     // to zero, as suggested in the above FAQ.
-    float a = (angle / 2.0f) * M_PI / 180.0f;
+    float a = qDegreesToRadians(angle / 2.0f);
     float s = std::sin(a);
     float c = std::cos(a);
     QVector3D ax = axis.normalized();
@@ -467,7 +467,7 @@ QQuaternion QQuaternion::fromAxisAndAngle
         y /= length;
         z /= length;
     }
-    float a = (angle / 2.0f) * M_PI / 180.0f;
+    float a = qDegreesToRadians(angle / 2.0f);
     float s = std::sin(a);
     float c = std::cos(a);
     return QQuaternion(c, x * s, y * s, z * s).normalized();
diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h
index 7f7f89db4d..cd0d746e55 100644
--- a/src/gui/math3d/qquaternion.h
+++ b/src/gui/math3d/qquaternion.h
@@ -210,8 +210,8 @@ inline QQuaternion QQuaternion::inverted() const
                  double(yp) * double(yp) +
                  double(zp) * double(zp);
     if (!qFuzzyIsNull(len))
-        return QQuaternion(double(wp) / len, double(-xp) / len,
-                           double(-yp) / len, double(-zp) / len);
+        return QQuaternion(float(double(wp) / len), float(double(-xp) / len),
+                           float(double(-yp) / len), float(double(-zp) / len));
     return QQuaternion(0.0f, 0.0f, 0.0f, 0.0f);
 }
 
diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h
index 5e0394b998..2af5132665 100644
--- a/src/gui/math3d/qvector2d.h
+++ b/src/gui/math3d/qvector2d.h
@@ -137,7 +137,7 @@ Q_DECL_CONSTEXPR inline QVector2D::QVector2D(float xpos, float ypos) : xp(xpos),
 
 Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPoint& point) : xp(point.x()), yp(point.y()) {}
 
-Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : xp(point.x()), yp(point.y()) {}
+Q_DECL_CONSTEXPR inline QVector2D::QVector2D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())) {}
 
 inline bool QVector2D::isNull() const
 {
diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h
index a728fd76bf..f3e8c976b7 100644
--- a/src/gui/math3d/qvector3d.h
+++ b/src/gui/math3d/qvector3d.h
@@ -154,7 +154,7 @@ Q_DECL_CONSTEXPR inline QVector3D::QVector3D() : xp(0.0f), yp(0.0f), zp(0.0f) {}
 
 Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f) {}
 
-Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f) {}
+Q_DECL_CONSTEXPR inline QVector3D::QVector3D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())), zp(0.0f) {}
 
 inline bool QVector3D::isNull() const
 {
diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h
index be373aa806..3f14b41e8e 100644
--- a/src/gui/math3d/qvector4d.h
+++ b/src/gui/math3d/qvector4d.h
@@ -146,7 +146,7 @@ Q_DECL_CONSTEXPR inline QVector4D::QVector4D(float xpos, float ypos, float zpos,
 
 Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPoint& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {}
 
-Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPointF& point) : xp(point.x()), yp(point.y()), zp(0.0f), wp(0.0f) {}
+Q_DECL_CONSTEXPR inline QVector4D::QVector4D(const QPointF& point) : xp(float(point.x())), yp(float(point.y())), zp(0.0f), wp(0.0f) {}
 
 inline bool QVector4D::isNull() const
 {