diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-13 04:32:19 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-13 04:32:19 (GMT) |
| commit | 72094648438d8214dcaabddf4d94d9d7e346675a (patch) | |
| tree | 70299a21019092948eae00829f299b69676487db /src/declarative | |
| parent | 7894bbb901a2ba74284bd6c0544b06c6a41f6b6f (diff) | |
| download | Qt-72094648438d8214dcaabddf4d94d9d7e346675a.zip Qt-72094648438d8214dcaabddf4d94d9d7e346675a.tar.gz Qt-72094648438d8214dcaabddf4d94d9d7e346675a.tar.bz2 | |
Fix crash on remote content.
Breakage was actually quite bad, just hard to reproduce.
Task-number: QTBUG-10565
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompositetypemanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecompositetypemanager.cpp b/src/declarative/qml/qdeclarativecompositetypemanager.cpp index 0ea198d..6014b10 100644 --- a/src/declarative/qml/qdeclarativecompositetypemanager.cpp +++ b/src/declarative/qml/qdeclarativecompositetypemanager.cpp @@ -509,7 +509,9 @@ void QDeclarativeCompositeTypeManager::checkComplete(QDeclarativeCompositeTypeDa unit->errors = u->errors; doComplete(unit); return; - } else if (u->status == QDeclarativeCompositeTypeData::Waiting) { + } else if (u->status == QDeclarativeCompositeTypeData::Waiting + || u->status == QDeclarativeCompositeTypeData::WaitingResources) + { waiting++; } } |