From 72094648438d8214dcaabddf4d94d9d7e346675a Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Thu, 13 May 2010 14:32:19 +1000 Subject: Fix crash on remote content. Breakage was actually quite bad, just hard to reproduce. Task-number: QTBUG-10565 --- src/declarative/qml/qdeclarativecompositetypemanager.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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++; } } -- cgit v0.12