diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 07:09:19 +0200 |
| commit | 34956bc234bf1b2ebcf224a256297293ba4276aa (patch) | |
| tree | 732fc88b9ea113e8ff3f106a5e5bc33610c5ed57 /src/qml/qml | |
| parent | e3a6565c3832e6f3001d49c52ca59fa4fa555f1b (diff) | |
| parent | 210617de78c78af44efdc251ba7a207c5c26e11c (diff) | |
Merge remote-tracking branch 'origin/5.7.0' into 5.7
Change-Id: I7b0ad528da17ecdb955c2d0c792c9f113904623e
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqmltypeloader.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp index 29fdf78797..739a833a30 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1950,7 +1950,8 @@ 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(); - if (typeData->m_compiledData && typeData->m_compiledData->count() == 1) { + if (typeData->m_compiledData && typeData->count() == 1 + && typeData->m_compiledData->count() == 1) { // There are no live objects of this type unneededTypes.append(iter); } |