Merge remote-tracking branch 'origin/dev' into wip/cmake

 Conflicts:
        src/corelib/Qt5CoreConfigExtras.cmake.in
        src/corelib/Qt5CoreMacros.cmake
        src/dbus/Qt5DBusConfigExtras.cmake.in
        src/widgets/Qt5WidgetsConfigExtras.cmake.in

Change-Id: Ib782f3b177c38b2cce83beebe15be9c0baa578f7

6 files changed, 21 insertions, 10 deletions

diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index ad4cdfdbf4..cdaed788e9 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -187,7 +187,10 @@ QMatrix4x4::QMatrix4x4(const float *values, int cols, int rows)
     flagBits = General;
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
+    \obsolete
+
     Constructs a 4x4 matrix from a conventional Qt 2D affine
     transformation \a matrix.
 
@@ -218,6 +221,7 @@ QMatrix4x4::QMatrix4x4(const QMatrix& matrix)
     m[3][3] = 1.0f;
     flagBits = Translation | Scale | Rotation2D;
 }
+#endif // QT_DEPRECATED_SINCE(5, 15)
 
 /*!
     Constructs a 4x4 matrix from the conventional Qt 2D
@@ -1659,7 +1663,12 @@ void QMatrix4x4::copyDataTo(float *values) const
             values[row * 4 + col] = float(m[col][row]);
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
+    \obsolete
+
+    Use toTransform() instead.
+
     Returns the conventional Qt 2D affine transformation matrix that
     corresponds to this matrix.  It is assumed that this matrix
     only contains 2D affine transformation elements.
@@ -1672,6 +1681,7 @@ QMatrix QMatrix4x4::toAffine() const
                    m[1][0], m[1][1],
                    m[3][0], m[3][1]);
 }
+#endif // QT_DEPRECATED_SINCE(5, 15)
 
 /*!
     Returns the conventional Qt 2D transformation matrix that
@@ -2007,7 +2017,7 @@ void QMatrix4x4::optimize()
 */
 QMatrix4x4::operator QVariant() const
 {
-    return QVariant(QVariant::Matrix4x4, this);
+    return QVariant(QMetaType::QMatrix4x4, this);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 1439bfac59..5a8b2c0daf 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -72,7 +72,9 @@ public:
 
     QMatrix4x4(const float *values, int cols, int rows);
     QMatrix4x4(const QTransform& transform);
+#if QT_DEPRECATED_SINCE(5, 15)
     QMatrix4x4(const QMatrix& matrix);
+#endif // QT_DEPRECATED_SINCE(5, 15)
 
     inline const float& operator()(int row, int column) const;
     inline float& operator()(int row, int column);
@@ -156,7 +158,9 @@ public:
 
     void copyDataTo(float *values) const;
 
-    QMatrix toAffine() const;
+#if QT_DEPRECATED_SINCE(5, 15)
+    QT_DEPRECATED_X("Use toTransform()") QMatrix toAffine() const;
+#endif // QT_DEPRECATED_SINCE(5, 15)
     QTransform toTransform() const;
     QTransform toTransform(float distanceToPlane) const;
 
@@ -187,6 +191,7 @@ public:
     friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QMatrix4x4 &m);
 #endif
 
+    void projectedRotate(float angle, float x, float y, float z);
 private:
     float m[4][4];          // Column-major order to match OpenGL.
     int flagBits;           // Flag bits from the enum below.
@@ -206,10 +211,6 @@ private:
     explicit QMatrix4x4(int) { }
 
     QMatrix4x4 orthonormalInverse() const;
-
-    void projectedRotate(float angle, float x, float y, float z);
-
-    friend class QGraphicsRotation;
 };
 
 QT_WARNING_PUSH
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index 899ec12eb3..5f15949c5b 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -983,7 +983,7 @@ QQuaternion QQuaternion::nlerp
 */
 QQuaternion::operator QVariant() const
 {
-    return QVariant(QVariant::Quaternion, this);
+    return QVariant(QMetaType::QQuaternion, this);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp
index c04f8b1cbf..5f651cf376 100644
--- a/src/gui/math3d/qvector2d.cpp
+++ b/src/gui/math3d/qvector2d.cpp
@@ -531,7 +531,7 @@ QVector4D QVector2D::toVector4D() const
 */
 QVector2D::operator QVariant() const
 {
-    return QVariant(QVariant::Vector2D, this);
+    return QVariant(QMetaType::QVector2D, this);
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index 4f72c1da66..08c3de99d2 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -706,7 +706,7 @@ QVector4D QVector3D::toVector4D() const
 */
 QVector3D::operator QVariant() const
 {
-    return QVariant(QVariant::Vector3D, this);
+    return QVariant(QMetaType::QVector3D, this);
 }
 
 /*!
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp
index 3a68bd6cb7..070ea7454e 100644
--- a/src/gui/math3d/qvector4d.cpp
+++ b/src/gui/math3d/qvector4d.cpp
@@ -608,7 +608,7 @@ QVector3D QVector4D::toVector3DAffine() const
 */
 QVector4D::operator QVariant() const
 {
-    return QVariant(QVariant::Vector4D, this);
+    return QVariant(QMetaType::QVector4D, this);
 }
 
 #ifndef QT_NO_DEBUG_STREAM