diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-21 19:24:06 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-21 19:24:06 +0000 |
| commit | a03eb67a786788511302a8ac3ecc809002408fed (patch) | |
| tree | 48272e563d4f94781afb909a8773c4fbb428e39a /src/qml/qml/qqmltypeloader.cpp | |
| parent | 84b51ca931e6a673738c59ac4686340c4199e203 (diff) | |
| parent | 43431619d644ebd783d292a12c1904cfd7680824 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/qml/qqmltypeloader.cpp')
| -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 1158cde5ca..190ac29e33 100644 --- a/src/qml/qml/qqmltypeloader.cpp +++ b/src/qml/qml/qqmltypeloader.cpp @@ -1953,7 +1953,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); } |