Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	src/qml/compiler/qv4isel_moth_p.h

Change-Id: I8e86a649d1ef8ad27dc66cc8c290093b2faabc69

1 files changed, 33 insertions, 0 deletions

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 25bb52ad2b..01f1f93b81 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -116,6 +116,39 @@ void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor)
     QQmlValueTypeFactory::registerValueTypes(uri, versionMajor, versionMinor);
 }
 
+// Declared in qqml.h
+int qmlRegisterUncreatableMetaObject(const QMetaObject &staticMetaObject,
+                                     const char *uri, int versionMajor,
+                                     int versionMinor, const char *qmlName,
+                                     const QString& reason)
+{
+    QQmlPrivate::RegisterType type = {
+        0,
+
+        0,
+        0,
+        0,
+        Q_NULLPTR,
+        reason,
+
+        uri, versionMajor, versionMinor, qmlName, &staticMetaObject,
+
+        QQmlAttachedPropertiesFunc(),
+        Q_NULLPTR,
+
+        0,
+        0,
+        0,
+
+        Q_NULLPTR, Q_NULLPTR,
+
+        Q_NULLPTR,
+        0
+    };
+
+    return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type);
+}
+
 /*!
   \qmltype QtObject
     \instantiates QObject