diff options
| author | Charles Yin <charles.yin@nokia.com> | 2012-05-08 10:42:28 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-09 00:56:16 +0200 |
| commit | 68b899266ca209d43026376a6cf9d7bbdc3483b8 (patch) | |
| tree | 0a0d2068c5dcafc2d86883405025db33e00b2373 /src/qml/qml/qqmlcomponent.cpp | |
| parent | 08bafae3a1c148353e3f37f9966b9ecc28ba3a5f (diff) | |
Better checking top level root object creation status
Add QQmlContextData::isRootObjectInCreation flag, only set it to true in Init qml instruction,
once a root ojbect created, set it to false and set QQmlData::rootObjectInCreation to true.
Change-Id: Iba7b348ab664a472280d8d7283e93787b3dd0a56
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlcomponent.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index e904188d4f..ef2a357636 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -836,7 +836,7 @@ QQmlComponentPrivate::beginCreate(QQmlContextData *context) //if JS ownership is needed this needs to be explicitly undone (like in component.createObject()) ddata->indestructible = true; ddata->explicitIndestructibleSet = true; - ddata->inCreation = false; + ddata->rootObjectInCreation = false; } if (enginePriv->isDebugging && rv) { |