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

Conflicts:
	src/qml/qml/qqmltypeloader.cpp

Change-Id: I07647700fc86764c95a5ef95c568e700a70fe45f

1 files changed, 5 insertions, 2 deletions

diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index 566f5ef767..20bd5d2620 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -1965,10 +1965,13 @@ void QQmlTypeLoader::trimCache()
         QList<TypeCache::Iterator> unneededTypes;
         for (TypeCache::Iterator iter = m_typeCache.begin(), end = m_typeCache.end(); iter != end; ++iter)  {
             QQmlTypeData *typeData = iter.value();
+
+            const bool hasError = !typeData->m_compiledData && !typeData->m_errors.isEmpty();
+            const bool isNotReferenced = typeData->isComplete() && typeData->m_compiledData
+                    && typeData->m_compiledData->count() == 1;
             // typeData->m_compiledData may be set early on in the proccess of loading a file, so it's important
             // to check the general loading status of the typeData before making any other decisions.
-            if (typeData->isComplete() && typeData->m_compiledData && typeData->count() == 1
-                    && typeData->m_compiledData->count() == 1) {
+            if (typeData->count() == 1 && (hasError || isNotReferenced)) {
                 // There are no live objects of this type
                 unneededTypes.append(iter);
             }