1 files changed, 30 insertions, 0 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 7ba18cd761..190ac29e33 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -49,6 +49,7 @@
 #include <private/qqmlprofiler_p.h>
 #include <private/qqmlmemoryprofiler_p.h>
 #include <private/qqmltypecompiler_p.h>
+#include <private/qqmlpropertyvalidator_p.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
@@ -445,6 +446,21 @@ void QQmlDataBlob::setError(const QQmlCompileError &error)
     setError(e);
 }
 
+void QQmlDataBlob::setError(const QVector<QQmlCompileError> &errors)
+{
+    QList<QQmlError> finalErrors;
+    finalErrors.reserve(errors.count());
+    for (const QQmlCompileError &error: errors) {
+        QQmlError e;
+        e.setColumn(error.location.column);
+        e.setLine(error.location.line);
+        e.setDescription(error.description);
+        e.setUrl(url());
+        finalErrors << e;
+    }
+    setError(finalErrors);
+}
+
 void QQmlDataBlob::setError(const QString &description)
 {
     QQmlError e;
@@ -2082,6 +2098,20 @@ void QQmlTypeData::done()
         compile();
 
     if (!isError()) {
+        QQmlEnginePrivate * const engine = QQmlEnginePrivate::get(typeLoader()->engine());
+        {
+        // Sanity check property bindings
+            QQmlPropertyValidator validator(engine, m_importCache, m_compiledData);
+            QVector<QQmlCompileError> errors = validator.validate();
+            if (!errors.isEmpty()) {
+                setError(errors);
+            }
+        }
+
+        m_compiledData->finalize(engine);
+    }
+
+    if (!isError()) {
         QQmlType *type = QQmlMetaType::qmlType(finalUrl(), true);
         if (m_compiledData && m_compiledData->data->flags & QV4::CompiledData::Unit::IsSingleton) {
             if (!type) {