diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-14 04:26:32 (GMT) |
| commit | 799380ea82ced8cc5eb4eed5b1306748125331fa (patch) | |
| tree | 41140bd1687211ae305f7b0e0f1cd2d413db3c94 /src/declarative/qml/qmlcomponent.cpp | |
| parent | a093c5ef65aa2c28f52f78c8be5bbe7d567646fa (diff) | |
| parent | 59b3e3ba52891197510115f912e7934ac1784d7c (diff) | |
| download | Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.zip Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.gz Qt-799380ea82ced8cc5eb4eed5b1306748125331fa.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/qmljsparser.cpp
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 6b83c1f..52315f9 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -523,8 +523,9 @@ QObject *QmlComponent::beginCreate(QmlContext *context) if (!d->engine->d_func()->rootComponent) d->engine->d_func()->rootComponent = this; - QmlContext *ctxt = - new QmlContext(context, 0); + QmlContextPrivate *contextPriv = + static_cast<QmlContextPrivate *>(QObjectPrivate::get(context)); + QmlContext *ctxt = new QmlContext(context, 0, true); static_cast<QmlContextPrivate*>(ctxt->d_ptr)->url = d->cc->url; if(d->start != -1) { // ### FIXME @@ -558,6 +559,8 @@ QObject *QmlComponent::beginCreate(QmlContext *context) delete ctxt; } + if (rv && !contextPriv->isInternal && ep->isDebugging) + contextPriv->instances.append(rv); return rv; } |