Remove QAbstractTransform and friends

New simplified QTransform doesn't need these any longer. We now get a
nice reduction in QObject count when dealing with transformations.

Change-Id: I8ba8febada4ad1f05728aa848fb5e70a62028040
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

39 files changed, 1 insertions, 1731 deletions

diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index b34a3a18c..f21ff51d3 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -61,9 +61,6 @@
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qsceneloader.h>
 
-#include <Qt3DCore/qscaletransform.h>
-#include <Qt3DCore/qrotatetransform.h>
-#include <Qt3DCore/qlookattransform.h>
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qaspectengine.h>
 
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h
index fa1fc20b6..7ef8dd198 100644
--- a/examples/qt3d/basicshapes-cpp/scenemodifier.h
+++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h
@@ -40,10 +40,7 @@
 #include <QtCore/QObject>
 
 #include <Qt3DCore/qentity.h>
-#include <Qt3DCore/qscaletransform.h>
-#include <Qt3DCore/qrotatetransform.h>
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DCore/QTranslateTransform>
 
 #include <Qt3DRender/QTorusMesh>
 #include <Qt3DRender/QCylinderMesh>
diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 26eacb0d2..47a2766ff 100644
--- a/examples/qt3d/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
@@ -45,9 +45,6 @@
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QTranslateTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QScaleTransform>
 #include <Qt3DCore/qaspectengine.h>
 #include <Qt3DInput/QInputAspect>
 #include <Qt3DRender/QParameter>
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index 3e47abc59..7f2fc31ac 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -41,6 +41,7 @@
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DCore/qaspectengine.h>
+#include <Qt3DCore/qtransform.h>
 
 #include <Qt3DInput/QInputAspect>
 
@@ -52,13 +53,6 @@
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qsceneloader.h>
-
-#include <Qt3DCore/qtranslatetransform.h>
-#include <Qt3DCore/qmatrixtransform.h>
-#include <Qt3DCore/qrotatetransform.h>
-#include <Qt3DCore/qlookattransform.h>
-#include <Qt3DCore/qtransform.h>
-
 #include <Qt3DRender/qcameraselector.h>
 #include <Qt3DRender/qrenderpassfilter.h>
 #include <Qt3DRender/qtechniquefilter.h>
diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp
index ed94f96a5..6b8da8490 100644
--- a/examples/qt3d/custom-mesh-cpp/main.cpp
+++ b/examples/qt3d/custom-mesh-cpp/main.cpp
@@ -41,10 +41,6 @@
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QCameraLens>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QLookAtTransform>
-#include <Qt3DCore/QScaleTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QTranslateTransform>
 #include <Qt3DCore/QAspectEngine>
 
 #include <Qt3DInput/QInputAspect>
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index b6441314e..a4d190200 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -51,9 +51,6 @@
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qrenderpass.h>
 
-#include <Qt3DCore/qscaletransform.h>
-#include <Qt3DCore/qrotatetransform.h>
-#include <Qt3DCore/qlookattransform.h>
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qaspectengine.h>
 
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 111643ac4..3ab122b0a 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -49,9 +49,6 @@
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QCameraLens>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QLookAtTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRender/QPointLight>
 #include <Qt3DRender/QWindow>
 #include <Qt3DCore/qaspectengine.h>
diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp
index a3785bbf0..86d2dba79 100644
--- a/examples/qt3d/materials-cpp/planeentity.cpp
+++ b/examples/qt3d/materials-cpp/planeentity.cpp
@@ -38,8 +38,6 @@
 
 #include <Qt3DRender/QPlaneMesh>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QScaleTransform>
-#include <Qt3DCore/QTranslateTransform>
 
 PlaneEntity::PlaneEntity(Qt3DCore::QNode *parent)
     : Qt3DCore::QEntity(new Qt3DCore::QEntity(parent))
diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h
index 85499226f..af7233a00 100644
--- a/examples/qt3d/materials-cpp/renderableentity.h
+++ b/examples/qt3d/materials-cpp/renderableentity.h
@@ -39,9 +39,6 @@
 
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QScaleTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRender/QMesh>
 
 class RenderableEntity : public Qt3DCore::QEntity
diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h
index ff4e921da..b96291512 100644
--- a/examples/qt3d/materials-cpp/trefoilknot.h
+++ b/examples/qt3d/materials-cpp/trefoilknot.h
@@ -39,9 +39,6 @@
 
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QScaleTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QTranslateTransform>
 #include <Qt3DRender/QMesh>
 
 class TrefoilKnot : public Qt3DCore::QEntity
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp
index 3a24867e7..baaece681 100644
--- a/examples/qt3d/simple-cpp/main.cpp
+++ b/examples/qt3d/simple-cpp/main.cpp
@@ -40,10 +40,6 @@
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QCameraLens>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QLookAtTransform>
-#include <Qt3DCore/QScaleTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QTranslateTransform>
 #include <Qt3DCore/QAspectEngine>
 
 #include <Qt3DInput/QInputAspect>
@@ -52,7 +48,6 @@
 #include <Qt3DRender/QFrameGraph>
 #include <Qt3DRender/QForwardRenderer>
 #include <Qt3DRender/QPhongMaterial>
-
 #include <Qt3DRender/QCylinderMesh>
 #include <Qt3DRender/QSphereMesh>
 #include <Qt3DRender/QTorusMesh>
diff --git a/src/core/core-components/qcamera_p.h b/src/core/core-components/qcamera_p.h
index bb73a3f4e..c64b4a5ab 100644
--- a/src/core/core-components/qcamera_p.h
+++ b/src/core/core-components/qcamera_p.h
@@ -49,7 +49,6 @@
 //
 
 #include <Qt3DCore/qcameralens.h>
-#include <Qt3DCore/qlookattransform.h>
 #include <Qt3DCore/qtransform.h>
 #include <private/qentity_p.h>
 
diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp
index ca2a3acf8..ad1a574fb 100644
--- a/src/core/nodes/qentity.cpp
+++ b/src/core/nodes/qentity.cpp
@@ -38,8 +38,6 @@
 #include "qentity_p.h"
 #include "qcomponent.h"
 #include "qcomponent_p.h"
-#include "qabstracttransform.h"
-#include "qmatrixtransform.h"
 
 #include <Qt3DCore/private/qscene_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
diff --git a/src/core/transforms/qabstracttransform.cpp b/src/core/transforms/qabstracttransform.cpp
deleted file mode 100644
index 3e70b0c5b..000000000
--- a/src/core/transforms/qabstracttransform.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qabstracttransform.h"
-#include "qabstracttransform_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-/*!
-    \class Qt3DCore::QAbstractTransformPrivate
-    \internal
-*/
-QAbstractTransformPrivate::QAbstractTransformPrivate()
-    : QObjectPrivate()
-{
-}
-
-QAbstractTransform::QAbstractTransform(QObject *parent)
-    : QObject(*new QAbstractTransformPrivate, parent)
-{
-}
-
-/*! \internal */
-QAbstractTransform::QAbstractTransform(QAbstractTransformPrivate &dd, QObject *parent)
-    : QObject(dd, parent)
-{
-}
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
diff --git a/src/core/transforms/qabstracttransform.h b/src/core/transforms/qabstracttransform.h
deleted file mode 100644
index fae453bce..000000000
--- a/src/core/transforms/qabstracttransform.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QABSTRACT_TRANSFORM_H
-#define QT3DCORE_QABSTRACT_TRANSFORM_H
-
-#include <QtCore/qobject.h>
-#include <Qt3DCore/qt3dcore_global.h>
-
-#include <QMatrix4x4>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QAbstractTransformPrivate;
-class QT3DCORESHARED_EXPORT QAbstractTransform : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QMatrix4x4 transformMatrix READ transformMatrix NOTIFY transformMatrixChanged)
-public:
-    explicit QAbstractTransform(QObject *parent = Q_NULLPTR);
-
-    virtual QMatrix4x4 transformMatrix() const = 0;
-Q_SIGNALS:
-    void transformMatrixChanged();
-
-protected:
-    QAbstractTransform(QAbstractTransformPrivate &dd, QObject *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QAbstractTransform)
-    Q_DISABLE_COPY(QAbstractTransform)
-};
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // of QT3DCORE_QABSTRACT_TRANSFORM_H
diff --git a/src/core/transforms/qabstracttransform_p.h b/src/core/transforms/qabstracttransform_p.h
deleted file mode 100644
index 44498d7b0..000000000
--- a/src/core/transforms/qabstracttransform_p.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QABSTRACTTRANSFORM_P_H
-#define QT3DCORE_QABSTRACTTRANSFORM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qobject_p.h>
-#include <Qt3DCore/qabstracttransform.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QAbstractTransformPrivate : public QObjectPrivate
-{
-public:
-    QAbstractTransformPrivate();
-    Q_DECLARE_PUBLIC(QAbstractTransform)
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-
-#endif // QT3DCORE_QABSTRACTTRANSFORM_P_H
diff --git a/src/core/transforms/qlookattransform.cpp b/src/core/transforms/qlookattransform.cpp
deleted file mode 100644
index 3ff83b547..000000000
--- a/src/core/transforms/qlookattransform.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qlookattransform.h"
-#include "qlookattransform_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-/*!
-    \class Qt3DCore::QLookAtTransformPrivate
-    \internal
-*/
-QLookAtTransformPrivate::QLookAtTransformPrivate()
-    : QAbstractTransformPrivate()
-    , m_matrixDirty(true)
-{
-}
-
-
-QLookAtTransform::QLookAtTransform(QObject *parent)
-    : QAbstractTransform(*new QLookAtTransformPrivate, parent)
-{
-}
-
-/*! \internal */
-QLookAtTransform::QLookAtTransform(QLookAtTransformPrivate &dd, QObject *parent)
-    : QAbstractTransform(dd, parent)
-{
-}
-
-QMatrix4x4 QLookAtTransform::transformMatrix() const
-{
-    Q_D(const QLookAtTransform);
-    if (d->m_matrixDirty) {
-        d->m_matrix.setToIdentity();
-        d->m_matrix.lookAt(d->m_position, d->m_viewCenter, d->m_upVector);
-        d->m_matrixDirty = false;
-    }
-    return d->m_matrix;
-}
-
-QVector3D QLookAtTransform::position() const
-{
-    Q_D(const QLookAtTransform);
-    return d->m_position;
-}
-
-void QLookAtTransform::setPosition(const QVector3D &position)
-{
-    Q_D(QLookAtTransform);
-    if (d->m_position != position) {
-        d->m_position = position;
-        d->m_viewVector = d->m_viewCenter - position;
-        d->m_matrixDirty = true;
-        emit positionChanged();
-        emit viewVectorChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-void QLookAtTransform::setUpVector(const QVector3D &upVector)
-{
-    Q_D(QLookAtTransform);
-    if (d->m_upVector != upVector) {
-        d->m_upVector = upVector;
-        d->m_matrixDirty = true;
-        emit upVectorChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-QVector3D QLookAtTransform::upVector() const
-{
-    Q_D(const QLookAtTransform);
-    return d->m_upVector;
-}
-
-void QLookAtTransform::setViewCenter(const QVector3D &viewCenter)
-{
-    Q_D(QLookAtTransform);
-    if (d->m_viewCenter != viewCenter) {
-        d->m_viewCenter = viewCenter;
-        d->m_viewVector = viewCenter - d->m_position;
-        d->m_matrixDirty = true;
-        emit viewCenterChanged();
-        emit viewVectorChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-QVector3D QLookAtTransform::viewCenter() const
-{
-    Q_D(const QLookAtTransform);
-    return d->m_viewCenter;
-}
-
-void QLookAtTransform::setViewVector(const QVector3D &viewVector)
-{
-    Q_D(QLookAtTransform);
-    if (!qFuzzyCompare(d->m_viewVector, viewVector)) {
-        d->m_viewVector = viewVector;
-        // modify the view center, not the position
-        d->m_viewCenter = d->m_position + viewVector;
-        d->m_matrixDirty = true;
-        emit viewVectorChanged();
-        emit viewCenterChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-QVector3D QLookAtTransform::viewVector() const
-{
-    Q_D(const QLookAtTransform);
-    return d->m_viewVector;
-}
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
diff --git a/src/core/transforms/qlookattransform.h b/src/core/transforms/qlookattransform.h
deleted file mode 100644
index 4febdc16a..000000000
--- a/src/core/transforms/qlookattransform.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QLOOKATTRANSFORM_H
-#define QT3DCORE_QLOOKATTRANSFORM_H
-
-#include <Qt3DCore/qabstracttransform.h>
-
-#include <QVector3D>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QLookAtTransformPrivate;
-
-class QT3DCORESHARED_EXPORT QLookAtTransform : public Qt3DCore::QAbstractTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QVector3D position READ position WRITE setPosition NOTIFY positionChanged)
-    Q_PROPERTY(QVector3D upVector READ upVector WRITE setUpVector NOTIFY upVectorChanged)
-    Q_PROPERTY(QVector3D viewCenter READ viewCenter WRITE setViewCenter NOTIFY viewCenterChanged)
-    Q_PROPERTY(QVector3D viewVector READ viewVector NOTIFY viewVectorChanged)
-
-public:
-    explicit QLookAtTransform(QObject *parent = Q_NULLPTR);
-
-    QMatrix4x4 transformMatrix() const Q_DECL_OVERRIDE;
-
-    void setPosition(const QVector3D &position);
-    QVector3D position() const;
-
-    void setUpVector(const QVector3D &upVector);
-    QVector3D upVector() const;
-
-    void setViewCenter(const QVector3D &viewCenter);
-    QVector3D viewCenter() const;
-
-    void setViewVector(const QVector3D &viewVector);
-    QVector3D viewVector() const;
-
-Q_SIGNALS:
-    void positionChanged();
-    void upVectorChanged();
-    void viewCenterChanged();
-    void viewVectorChanged();
-
-protected:
-    QLookAtTransform(QLookAtTransformPrivate &dd, QObject *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QLookAtTransform)
-    Q_DISABLE_COPY(QLookAtTransform)
-};
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QLOOKATTRANSFORM_H
diff --git a/src/core/transforms/qlookattransform_p.h b/src/core/transforms/qlookattransform_p.h
deleted file mode 100644
index 791905507..000000000
--- a/src/core/transforms/qlookattransform_p.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QLOOKATTRANSFORM_P_H
-#define QT3DCORE_QLOOKATTRANSFORM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qabstracttransform_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QLookAtTransform;
-class QLookAtTransformPrivate : public QAbstractTransformPrivate
-{
-public :
-    QLookAtTransformPrivate();
-
-    Q_DECLARE_PUBLIC(QLookAtTransform)
-
-    mutable QMatrix4x4 m_matrix;
-    QVector3D m_position;
-    QVector3D m_upVector;
-    QVector3D m_viewCenter;
-    QVector3D m_viewVector; // From "camera" position to view center
-    mutable bool m_matrixDirty;
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QLOOKATTRANSFORM_P_H
diff --git a/src/core/transforms/qmatrixtransform.cpp b/src/core/transforms/qmatrixtransform.cpp
deleted file mode 100644
index 15e024fec..000000000
--- a/src/core/transforms/qmatrixtransform.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmatrixtransform.h"
-#include "qmatrixtransform_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-/*!
-    \class Qt3DCore::QMatrixTransformPrivate
-    \internal
-*/
-QMatrixTransformPrivate::QMatrixTransformPrivate()
-    : QAbstractTransformPrivate()
-{
-}
-
-
-QMatrixTransform::QMatrixTransform(QObject *parent)
-    : QAbstractTransform(*new QMatrixTransformPrivate, parent)
-{
-}
-
-QMatrixTransform::QMatrixTransform(const QMatrix4x4 &m, QObject *parent)
-    : QAbstractTransform(*new QMatrixTransformPrivate, parent)
-{
-    Q_D(QMatrixTransform);
-    d->m_matrix = m;
-}
-
-QMatrixTransform::QMatrixTransform(QMatrixTransformPrivate &dd, QObject *parent)
-    : QAbstractTransform(dd, parent)
-{
-}
-
-QMatrix4x4 QMatrixTransform::matrix() const
-{
-    Q_D(const QMatrixTransform);
-    return d->m_matrix;
-}
-
-void QMatrixTransform::setMatrix(const QMatrix4x4 &matrix)
-{
-    Q_D(QMatrixTransform);
-    if (d->m_matrix != matrix) {
-        d->m_matrix = matrix;
-        emit matrixChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-QMatrix4x4 QMatrixTransform::transformMatrix() const
-{
-    return matrix();
-}
-
-} // namespace Qt3DCore
-
-/*!
-    \qmltype MatrixTransform
-    \inqmlmodule Qt3D.Core
-    \since 5.5
-    \instantiates Qt3DCore::QMatrixTransform
-*/
-
-/*!
-    \qmlproperty matrix4x4 Qt3DCore::MatrixTransform::matrix
-*/
-
-QT_END_NAMESPACE
diff --git a/src/core/transforms/qmatrixtransform.h b/src/core/transforms/qmatrixtransform.h
deleted file mode 100644
index ef1c6acb7..000000000
--- a/src/core/transforms/qmatrixtransform.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QMATRIXTRANSFORM_H
-#define QT3DCORE_QMATRIXTRANSFORM_H
-
-#include <Qt3DCore/qabstracttransform.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QMatrixTransformPrivate;
-
-class QT3DCORESHARED_EXPORT QMatrixTransform : public Qt3DCore::QAbstractTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QMatrix4x4 matrix READ matrix WRITE setMatrix NOTIFY matrixChanged)
-public:
-    explicit QMatrixTransform(QObject *parent = Q_NULLPTR);
-    QMatrixTransform(const QMatrix4x4 &m, QObject *parent = Q_NULLPTR);
-
-    QMatrix4x4 matrix() const;
-    void setMatrix(const QMatrix4x4 &matrix);
-
-    QMatrix4x4 transformMatrix() const Q_DECL_OVERRIDE;
-
-Q_SIGNALS:
-    void matrixChanged();
-
-protected:
-    QMatrixTransform(QMatrixTransformPrivate &dd, QObject *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QMatrixTransform)
-    Q_DISABLE_COPY(QMatrixTransform)
-};
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QMATRIXTRANSFORM_H
diff --git a/src/core/transforms/qmatrixtransform_p.h b/src/core/transforms/qmatrixtransform_p.h
deleted file mode 100644
index 378fbd85b..000000000
--- a/src/core/transforms/qmatrixtransform_p.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QMATRIXTRANSFORM_P_H
-#define QT3DCORE_QMATRIXTRANSFORM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qabstracttransform_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QMatrixTransform;
-
-class QMatrixTransformPrivate : public QAbstractTransformPrivate
-{
-public:
-    QMatrixTransformPrivate();
-
-    Q_DECLARE_PUBLIC(QMatrixTransform)
-    QMatrix4x4 m_matrix;
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QMATRIXTRANSFORM_P_H
diff --git a/src/core/transforms/qrotatetransform.cpp b/src/core/transforms/qrotatetransform.cpp
deleted file mode 100644
index 9f74a288a..000000000
--- a/src/core/transforms/qrotatetransform.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef _USE_MATH_DEFINES
-# define _USE_MATH_DEFINES // For MSVC
-#endif
-
-#include "qrotatetransform.h"
-#include "qrotatetransform_p.h"
-
-#include <qmath.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-/*!
-    \class Qt3DCore::QRotateTransformPrivate
-    \internal
-*/
-QRotateTransformPrivate::QRotateTransformPrivate()
-    : QAbstractTransformPrivate()
-    , m_angleDeg(0)
-    , m_axis(0.0f, 1.0f, 0.0f)
-{
-    updateMatrix();
-}
-
-void QRotateTransformPrivate::updateMatrix()
-{
-    QMatrix4x4 m;
-    m.rotate(m_angleDeg, m_axis);
-    m_matrix = m;
-}
-
-
-QRotateTransform::QRotateTransform(QObject *parent)
-    : QAbstractTransform(*new QRotateTransformPrivate, parent)
-{
-}
-
-/*! \internal */
-QRotateTransform::QRotateTransform(QRotateTransformPrivate &dd, QObject *parent)
-    : QAbstractTransform(dd, parent)
-{
-}
-
-float QRotateTransform::angleDeg() const
-{
-    Q_D(const QRotateTransform);
-    return d->m_angleDeg;
-}
-
-float Qt3DCore::QRotateTransform::angleRad() const
-{
-    Q_D(const QRotateTransform);
-    return qDegreesToRadians(d->m_angleDeg);
-}
-
-QVector3D QRotateTransform::axis() const
-{
-    Q_D(const QRotateTransform);
-    return d->m_axis;
-}
-
-QMatrix4x4 QRotateTransform::transformMatrix() const
-{
-    Q_D(const QRotateTransform);
-    return d->m_matrix;
-}
-
-void QRotateTransform::setAngleDeg(float arg)
-{
-    Q_D(QRotateTransform);
-    if (d->m_angleDeg != arg) {
-        d->m_angleDeg = arg;
-        d->updateMatrix();
-        emit angleChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-void QRotateTransform::setAngleRad(float arg)
-{
-    setAngleDeg(qRadiansToDegrees(arg));
-}
-
-void QRotateTransform::setAxis(const QVector3D& arg)
-{
-    Q_D(QRotateTransform);
-    if (d->m_axis != arg) {
-        d->m_axis = arg;
-        d->updateMatrix();
-        emit axisChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
diff --git a/src/core/transforms/qrotatetransform.h b/src/core/transforms/qrotatetransform.h
deleted file mode 100644
index bf5e09be1..000000000
--- a/src/core/transforms/qrotatetransform.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QROTATETRANSFORM_H
-#define QT3DCORE_QROTATETRANSFORM_H
-
-#include <Qt3DCore/qabstracttransform.h>
-
-#include <QVector3D>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QRotateTransformPrivate;
-
-class QT3DCORESHARED_EXPORT QRotateTransform : public QAbstractTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(float angle READ angleDeg WRITE setAngleDeg NOTIFY angleChanged)
-    Q_PROPERTY(float angleRad READ angleRad WRITE setAngleRad NOTIFY angleChanged)
-    Q_PROPERTY(QVector3D axis READ axis WRITE setAxis NOTIFY axisChanged)
-
-public:
-    explicit QRotateTransform(QObject *parent = Q_NULLPTR);
-
-    float angleDeg() const;
-    float angleRad() const;
-    QVector3D axis() const;
-    QMatrix4x4 transformMatrix() const Q_DECL_OVERRIDE;
-
-    void setAngleDeg(float arg);
-    void setAngleRad(float arg);
-    void setAxis(const QVector3D& arg);
-
-Q_SIGNALS:
-
-    void axisChanged();
-    void angleChanged();
-
-protected:
-    QRotateTransform(QRotateTransformPrivate &dd, QObject *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QRotateTransform)
-    Q_DISABLE_COPY(QRotateTransform)
-};
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QROTATETRANSFORM_H
diff --git a/src/core/transforms/qrotatetransform_p.h b/src/core/transforms/qrotatetransform_p.h
deleted file mode 100644
index 1f0ae06af..000000000
--- a/src/core/transforms/qrotatetransform_p.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QROTATETRANSFORM_P_H
-#define QT3DCORE_QROTATETRANSFORM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qabstracttransform_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QRotateTransform;
-
-class QRotateTransformPrivate : public QAbstractTransformPrivate
-{
-public:
-    QRotateTransformPrivate();
-
-    QMatrix4x4 m_matrix;
-
-    Q_DECLARE_PUBLIC(QRotateTransform)
-
-    float m_angleDeg;
-    QVector3D m_axis;
-
-    void updateMatrix();
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QROTATETRANSFORM_P_H
diff --git a/src/core/transforms/qscaletransform.cpp b/src/core/transforms/qscaletransform.cpp
deleted file mode 100644
index b150b145f..000000000
--- a/src/core/transforms/qscaletransform.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qscaletransform.h"
-#include "qscaletransform_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore
-{
-
-/*!
-    \class Qt3DCore::QScaleTransformPrivate
-    \internal
-*/
-QScaleTransformPrivate::QScaleTransformPrivate()
-    : QAbstractTransformPrivate()
-    , m_scale3D(1.0f, 1.0f, 1.0f)
-{
-}
-
-
-QScaleTransform::QScaleTransform(QObject *parent)
-    : QAbstractTransform(*new QScaleTransformPrivate, parent)
-{
-}
-
-/*! \internal */
-QScaleTransform::QScaleTransform(QScaleTransformPrivate &dd, QObject *parent)
-    : QAbstractTransform(dd, parent)
-{
-}
-
-QVector3D QScaleTransform::scale3D() const
-{
-    Q_D(const QScaleTransform);
-    return d->m_scale3D;
-}
-
-void QScaleTransform::setScale3D(const QVector3D &scale3D)
-{
-    Q_D(QScaleTransform);
-    if (scale3D != d->m_scale3D) {
-        d->m_scale3D = scale3D;
-        emit scale3DChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-float QScaleTransform::scale() const
-{
-    Q_D(const QScaleTransform);
-    return d->m_scale3D.x();
-}
-
-void QScaleTransform::setScale(float scale)
-{
-    Q_D(QScaleTransform);
-    if (scale != d->m_scale3D.x()) {
-        setScale3D(QVector3D(scale, scale, scale));
-        emit scaleChanged();
-    }
-}
-
-QMatrix4x4 QScaleTransform::transformMatrix() const
-{
-    Q_D(const QScaleTransform);
-    QMatrix4x4 mat;
-    mat.scale(d->m_scale3D);
-    return mat;
-}
-
-} // Qt3D
-
-QT_END_NAMESPACE
diff --git a/src/core/transforms/qscaletransform.h b/src/core/transforms/qscaletransform.h
deleted file mode 100644
index 7db2676dd..000000000
--- a/src/core/transforms/qscaletransform.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_SCALETRANSFORM_H
-#define QT3DCORE_SCALETRANSFORM_H
-
-#include <Qt3DCore/qabstracttransform.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QScaleTransformPrivate;
-
-class QT3DCORESHARED_EXPORT QScaleTransform : public QAbstractTransform
-{
-    Q_OBJECT
-    Q_PROPERTY(QVector3D scale3D READ scale3D WRITE setScale3D NOTIFY scale3DChanged)
-    Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
-
-public:
-    explicit QScaleTransform(QObject *parent = Q_NULLPTR);
-
-    QVector3D scale3D() const;
-    void    setScale3D(const QVector3D &scale3D);
-
-    float   scale() const;
-    void    setScale(float scale);
-
-    QMatrix4x4 transformMatrix() const Q_DECL_OVERRIDE;
-
-Q_SIGNALS:
-    void    scale3DChanged();
-    void    scaleChanged();
-
-protected:
-    QScaleTransform(QScaleTransformPrivate &dd, QObject *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QScaleTransform)
-    Q_DISABLE_COPY(QScaleTransform)
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_SCALETRANSFORM_H
diff --git a/src/core/transforms/qscaletransform_p.h b/src/core/transforms/qscaletransform_p.h
deleted file mode 100644
index a544f9c6b..000000000
--- a/src/core/transforms/qscaletransform_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QSCALETRANSFORM_P_H
-#define QT3DCORE_QSCALETRANSFORM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qabstracttransform_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QScaleTransform;
-class QScaleTransformPrivate : public QAbstractTransformPrivate
-{
-public:
-    QScaleTransformPrivate();
-
-    Q_DECLARE_PUBLIC(QScaleTransform)
-    QVector3D m_scale3D;
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QSCALETRANSFORM_P_H
diff --git a/src/core/transforms/qtransform.cpp b/src/core/transforms/qtransform.cpp
index 2e177e3b2..8d84728bb 100644
--- a/src/core/transforms/qtransform.cpp
+++ b/src/core/transforms/qtransform.cpp
@@ -36,7 +36,6 @@
 
 #include "qtransform.h"
 #include "qtransform_p.h"
-#include "qabstracttransform_p.h"
 #include "qmath3d_p.h"
 
 #include <Qt3DCore/qscenepropertychange.h>
diff --git a/src/core/transforms/qtranslatetransform.cpp b/src/core/transforms/qtranslatetransform.cpp
deleted file mode 100644
index bb24d8de6..000000000
--- a/src/core/transforms/qtranslatetransform.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qtranslatetransform.h"
-#include "qtranslatetransform_p.h"
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-
-/*!
-    \class Qt3DCore::QTranslateTransformPrivate
-    \internal
-*/
-QTranslateTransformPrivate::QTranslateTransformPrivate()
-    : QAbstractTransformPrivate()
-{
-}
-
-
-QTranslateTransform::QTranslateTransform(QObject *parent)
-    : QAbstractTransform(*new QTranslateTransformPrivate, parent)
-{
-}
-
-/*! \internal */
-QTranslateTransform::QTranslateTransform(QTranslateTransformPrivate &dd, QObject *parent)
-    : QAbstractTransform(dd, parent)
-{
-}
-
-float QTranslateTransform::dx() const
-{
-    Q_D(const QTranslateTransform);
-    return d->m_translation.x();
-}
-
-float QTranslateTransform::dy() const
-{
-    Q_D(const QTranslateTransform);
-    return d->m_translation.y();
-}
-
-float QTranslateTransform::dz() const
-{
-    Q_D(const QTranslateTransform);
-    return d->m_translation.z();
-}
-
-QVector3D QTranslateTransform::translation() const
-{
-    Q_D(const QTranslateTransform);
-    return d->m_translation;
-}
-
-QMatrix4x4 QTranslateTransform::transformMatrix() const
-{
-    Q_D(const QTranslateTransform);
-    QMatrix4x4 r;
-    r.translate(d->m_translation);
-    return r;
-}
-
-void QTranslateTransform::setDx(float arg)
-{
-    Q_D(QTranslateTransform);
-    if (arg != d->m_translation.x()) {
-        d->m_translation.setX(arg);
-        emit translateChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-void QTranslateTransform::setDy(float arg)
-{
-    Q_D(QTranslateTransform);
-    if (arg != d->m_translation.y()) {
-        d->m_translation.setY(arg);
-        emit translateChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-void QTranslateTransform::setDz(float arg)
-{
-    Q_D(QTranslateTransform);
-    if (arg != d->m_translation.z()) {
-        d->m_translation.setZ(arg);
-        emit translateChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-void QTranslateTransform::setTranslation(const QVector3D &arg)
-{
-    Q_D(QTranslateTransform);
-    if (d->m_translation != arg) {
-        d->m_translation = arg;
-        emit translateChanged();
-        emit transformMatrixChanged();
-    }
-}
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
diff --git a/src/core/transforms/qtranslatetransform.h b/src/core/transforms/qtranslatetransform.h
deleted file mode 100644
index ce763cde9..000000000
--- a/src/core/transforms/qtranslatetransform.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QTRANSLATETRANSFORM_H
-#define QT3DCORE_QTRANSLATETRANSFORM_H
-
-#include <Qt3DCore/qabstracttransform.h>
-
-#include <QVector3D>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QTranslateTransformPrivate;
-
-class QT3DCORESHARED_EXPORT QTranslateTransform : public QAbstractTransform
-{
-    Q_OBJECT
-
-    Q_PROPERTY(float dx READ dx WRITE setDx NOTIFY translateChanged)
-    Q_PROPERTY(float dy READ dy WRITE setDy NOTIFY translateChanged)
-    Q_PROPERTY(float dz READ dz WRITE setDz NOTIFY translateChanged)
-    Q_PROPERTY(QVector3D translation READ translation WRITE setTranslation NOTIFY translateChanged)
-
-public:
-    explicit QTranslateTransform(QObject *parent = Q_NULLPTR);
-
-    float dx() const;
-    float dy() const;
-    float dz() const;
-
-    QVector3D translation() const;
-
-    QMatrix4x4 transformMatrix() const Q_DECL_OVERRIDE;
-
-public Q_SLOTS:
-    void setDx(float arg);
-    void setDy(float arg);
-    void setDz(float arg);
-
-    void setTranslation(const QVector3D &arg);
-
-Q_SIGNALS:
-    void translateChanged();
-
-protected:
-    QTranslateTransform(QTranslateTransformPrivate &dd, QObject *parent = Q_NULLPTR);
-
-private:
-    Q_DECLARE_PRIVATE(QTranslateTransform)
-    Q_DISABLE_COPY(QTranslateTransform)
-};
-
-} // namespace Qt3DCore
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QTRANSLATETRANSFORM_H
diff --git a/src/core/transforms/qtranslatetransform_p.h b/src/core/transforms/qtranslatetransform_p.h
deleted file mode 100644
index 8f1f34f6a..000000000
--- a/src/core/transforms/qtranslatetransform_p.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt3D module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QT3DCORE_QTRANSLATETRANSFORM_P_H
-#define QT3DCORE_QTRANSLATETRANSFORM_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <private/qabstracttransform_p.h>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3DCore {
-
-class QTranslateTransform;
-class QTranslateTransformPrivate : public QAbstractTransformPrivate
-{
-public:
-    QTranslateTransformPrivate();
-    Q_DECLARE_PUBLIC(QTranslateTransform)
-
-    QVector3D m_translation;
-};
-
-} // Qt3D
-
-QT_END_NAMESPACE
-
-#endif // QT3DCORE_QTRANSLATETRANSFORM_P_H
diff --git a/src/core/transforms/transforms.pri b/src/core/transforms/transforms.pri
index 91f9af6ba..75ae7c7a9 100644
--- a/src/core/transforms/transforms.pri
+++ b/src/core/transforms/transforms.pri
@@ -1,28 +1,10 @@
 
 SOURCES += \
-        $$PWD/qabstracttransform.cpp \
-        $$PWD/qlookattransform.cpp \
-        $$PWD/qmatrixtransform.cpp \
-        $$PWD/qrotatetransform.cpp \
-        $$PWD/qtranslatetransform.cpp \
-        $$PWD/qscaletransform.cpp \
         $$PWD/qtransform.cpp
 
 HEADERS += \
-        $$PWD/qabstracttransform.h \
-        $$PWD/qlookattransform.h \
-        $$PWD/qmatrixtransform.h \
-        $$PWD/qrotatetransform.h \
-        $$PWD/qtranslatetransform.h \
-        $$PWD/qscaletransform.h \
         $$PWD/qtransform.h \
         $$PWD/qtransform_p.h \
-        $$PWD/qabstracttransform_p.h \
-        $$PWD/qlookattransform_p.h \
-        $$PWD/qmatrixtransform_p.h \
-        $$PWD/qrotatetransform_p.h \
-        $$PWD/qscaletransform_p.h \
-        $$PWD/qtranslatetransform_p.h \
         $$PWD/qmath3d_p.h
 
 INCLUDEPATH += $$PWD
diff --git a/src/input/cameracontroller.cpp b/src/input/cameracontroller.cpp
index 0efd6d002..2af5adf67 100644
--- a/src/input/cameracontroller.cpp
+++ b/src/input/cameracontroller.cpp
@@ -43,7 +43,6 @@
 #include <qcamera.h>
 #include <qcameralens.h>
 #include <qentity.h>
-#include <qmatrixtransform.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 6955bfc47..0d40b06c2 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -38,8 +38,6 @@
 
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DCore/qlookattransform.h>
-#include <Qt3DCore/qmatrixtransform.h>
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DRender/qparameter.h>
 #include <Qt3DRender/qeffect.h>
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index be1e08ebb..cf9c011cc 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -46,11 +46,7 @@
 
 #include <Qt3DCore/QCameraLens>
 #include <Qt3DCore/QEntity>
-#include <Qt3DCore/QMatrixTransform>
-#include <Qt3DCore/QRotateTransform>
-#include <Qt3DCore/QScaleTransform>
 #include <Qt3DCore/QTransform>
-#include <Qt3DCore/QTranslateTransform>
 
 #include <Qt3DCore/private/qurlhelper_p.h>
 
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index b2b4245e7..a4782535b 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -37,11 +37,6 @@
 #include "qt3dquick3dcoreplugin.h"
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DCore/qcamera.h>
-#include <Qt3DCore/qscaletransform.h>
-#include <Qt3DCore/qlookattransform.h>
-#include <Qt3DCore/qmatrixtransform.h>
-#include <Qt3DCore/qtranslatetransform.h>
-#include <Qt3DCore/qrotatetransform.h>
 #include <Qt3DCore/qabstractattribute.h>
 #include <Qt3DCore/qtransform.h>
 #include <private/quick3dentity_p.h>
@@ -57,7 +52,6 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
     Qt3DCore::Quick::Quick3D_initialize();
 
     qmlRegisterUncreatableType<Qt3DCore::QComponent>(uri, 2, 0, "Component3D", QStringLiteral(""));
-    qmlRegisterUncreatableType<Qt3DCore::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract"));
 
     qmlRegisterType<Qt3DCore::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration");
     Qt3DCore::Quick::registerExtendedType<Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity>("QEntity", "Qt3D.Core/Entity", uri, 2, 0, "Entity");
@@ -71,12 +65,6 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
     Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D.Core/Camera", uri, 2, 0, "Camera");
     qmlRegisterType<Qt3DCore::QCameraLens>(uri, 2, 0, "CameraLens");
 
-    qmlRegisterType<Qt3DCore::QMatrixTransform>(uri, 2, 0, "MatrixTransform");
-    qmlRegisterType<Qt3DCore::QTranslateTransform>(uri, 2, 0, "Translate");
-    qmlRegisterType<Qt3DCore::QRotateTransform>(uri, 2, 0, "Rotate");
-    qmlRegisterType<Qt3DCore::QLookAtTransform>(uri, 2, 0, "LookAt");
-    qmlRegisterType<Qt3DCore::QScaleTransform>(uri, 2, 0, "Scale");
-
     qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "AbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
 }
 
diff --git a/src/render/defaults/qskyboxentity.cpp b/src/render/defaults/qskyboxentity.cpp
index 7834ec2aa..740a3f14a 100644
--- a/src/render/defaults/qskyboxentity.cpp
+++ b/src/render/defaults/qskyboxentity.cpp
@@ -49,7 +49,6 @@
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qgraphicsapifilter.h>
 #include <Qt3DRender/qshaderprogram.h>
-#include <Qt3DCore/qtranslatetransform.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/defaults/qskyboxentity_p.h b/src/render/defaults/qskyboxentity_p.h
index b1ee4a506..6af4be384 100644
--- a/src/render/defaults/qskyboxentity_p.h
+++ b/src/render/defaults/qskyboxentity_p.h
@@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 class QTransform;
-class QTranslateTransform;
 }
 
 namespace Qt3DRender {