4 files changed, 11 insertions, 32 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index af44d737a2..b8bd00bf2f 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -216,35 +216,6 @@ void QQmlEnginePrivate::defineModule()
     >(uri, 2);
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-void QQmlEnginePrivate::registerQuickTypes()
-{
-    // Don't add anything here. These are only for backwards compatibility.
-    // Also, don't use qmlRegisterTypesAndRevisions as that will auto-add future revisions.
-
-    const char uri[] = "QtQuick";
-
-    qmlRegisterType<QQmlComponent>(uri, 2, 0, "Component");
-    qmlRegisterType<QObject>(uri, 2, 0, "QtObject");
-    qmlRegisterType<QQmlBind>(uri, 2, 0, "Binding");
-    qmlRegisterType<QQmlBind, 8>(uri, 2, 8, "Binding");
-    qmlRegisterCustomType<QQmlConnections>(uri, 2, 0, "Connections", new QQmlConnectionsParser);
-
-    // Connections revision 3 was added in QtQml 2.3, but only in QtQuick 2.7.
-    qmlRegisterCustomType<QQmlConnections, 3>(uri, 2, 7, "Connections", new QQmlConnectionsParser);
-
-#if QT_CONFIG(qml_animation)
-    qmlRegisterType<QQmlTimer>(uri, 2, 0,"Timer");
-#endif
-    qmlRegisterType<QQmlLoggingCategory>(uri, 2, 8, "LoggingCategory");
-    qmlRegisterType<QQmlLoggingCategory, 12>(uri, 2, 12, "LoggingCategory");
-#if QT_CONFIG(qml_locale)
-    // Locale was added in QtQuick 2.0 and in QtQml 2.2
-    qmlRegisterUncreatableType<QQmlLocale>(uri, 2, 0, "Locale", QQmlEngine::tr("Locale cannot be instantiated. Use Qt.locale()"));
-#endif
-}
-#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-
 bool QQmlEnginePrivate::designerMode()
 {
     return s_designerMode;
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index 5b1b676c89..98c7823921 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -259,9 +259,6 @@ public:
     static QList<QQmlError> qmlErrorFromDiagnostics(const QString &fileName, const QList<QQmlJS::DiagnosticMessage> &diagnosticMessages);
 
     static void defineModule();
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-    static void registerQuickTypes();
-#endif
 
     static bool designerMode();
     static void activateDesignerMode();
diff --git a/src/qml/qml/qqmlvaluetype.cpp b/src/qml/qml/qqmlvaluetype.cpp
index a4737b3da9..d83fc4bb48 100644
--- a/src/qml/qml/qqmlvaluetype.cpp
+++ b/src/qml/qml/qqmlvaluetype.cpp
@@ -130,8 +130,10 @@ const QMetaObject *QQmlValueTypeFactoryImpl::metaObjectForMetaType(int t)
         return &QQmlRectValueType::staticMetaObject;
     case QVariant::RectF:
         return &QQmlRectFValueType::staticMetaObject;
+#if QT_CONFIG(easingcurve)
     case QVariant::EasingCurve:
         return &QQmlEasingValueType::staticMetaObject;
+#endif
 #if QT_CONFIG(qml_itemmodel)
     case QVariant::ModelIndex:
         return &QQmlModelIndexValueType::staticMetaObject;
@@ -211,7 +213,9 @@ const QMetaObject *QQmlValueTypeFactory::metaObjectForMetaType(int type)
 
 void QQmlValueTypeFactory::registerValueTypes(const char *uri, int versionMajor, int versionMinor)
 {
+#if QT_CONFIG(easingcurve)
     qmlRegisterValueTypeEnums<QQmlEasingValueType>(uri, versionMajor, versionMinor, "Easing");
+#endif
 }
 
 QQmlValueType::QQmlValueType() :
@@ -506,6 +510,7 @@ int QQmlRectValueType::bottom() const
     return v.bottom();
 }
 
+#if QT_CONFIG(easingcurve)
 QQmlEasingValueType::Type QQmlEasingValueType::type() const
 {
     return (QQmlEasingValueType::Type)v.type();
@@ -589,6 +594,8 @@ QVariantList QQmlEasingValueType::bezierCurve() const
         rv << QVariant(point.x()) << QVariant(point.y());
     return rv;
 }
+#endif // easingcurve
+
 
 QT_END_NAMESPACE
 
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 9c008859da..0601237c4b 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -58,7 +58,9 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qrect.h>
+#if QT_CONFIG(easingcurve)
 #include <QtCore/qeasingcurve.h>
+#endif
 #include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
@@ -211,6 +213,7 @@ public:
     int bottom() const;
 };
 
+#if QT_CONFIG(easingcurve)
 struct QQmlEasingValueType
 {
     QEasingCurve v;
@@ -263,6 +266,7 @@ public:
     void setBezierCurve(const QVariantList &);
     QVariantList bezierCurve() const;
 };
+#endif
 
 template<typename T>
 int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName)