diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-12 07:33:32 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-12 07:33:32 (GMT) |
| commit | 893404a0ad649ba12d3ada2e94cc17cf77b96127 (patch) | |
| tree | 82444cd087375b6c50fea9a981e7c533eef78d0b /src/declarative/qml/qmlcomponent.cpp | |
| parent | e605366e234af3008942f4029079c2cb84465c69 (diff) | |
| download | Qt-893404a0ad649ba12d3ada2e94cc17cf77b96127.zip Qt-893404a0ad649ba12d3ada2e94cc17cf77b96127.tar.gz Qt-893404a0ad649ba12d3ada2e94cc17cf77b96127.tar.bz2 | |
More tests
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index da8f26d..24b5dd2 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -482,18 +482,19 @@ QObject *QmlComponent::beginCreate(QmlContext *context) ctxt->deactivate(); + QmlEnginePrivate *ep = d->engine->d_func(); + if (ep->rootComponent == this) { + ep->rootComponent = 0; + + d->bindValues = ep->bindValues; + d->parserStatus = ep->parserStatus; + ep->bindValues.clear(); + ep->parserStatus.clear(); + d->completePending = true; + } + if (rv) { QFx_setParent_noEvent(ctxt, rv); - QmlEnginePrivate *ep = d->engine->d_func(); - if (ep->rootComponent == this) { - ep->rootComponent = 0; - - d->bindValues = ep->bindValues; - d->parserStatus = ep->parserStatus; - ep->bindValues.clear(); - ep->parserStatus.clear(); - d->completePending = true; - } } else { delete ctxt; } |