diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2009-04-29 13:05:56 (GMT) |
|---|---|---|
| committer | Kai Koehne <kai.koehne@nokia.com> | 2009-05-05 09:51:11 (GMT) |
| commit | 4416bb70d751ff31818823f79d3d7ed3a3d94929 (patch) | |
| tree | e4439a2afca26a443ee40136502bc7265cc23046 /src/declarative/qml/qmlcomponent.cpp | |
| parent | a189a500173ed038e777902ac0a77f837a330c26 (diff) | |
| download | Qt-4416bb70d751ff31818823f79d3d7ed3a3d94929.zip Qt-4416bb70d751ff31818823f79d3d7ed3a3d94929.tar.gz Qt-4416bb70d751ff31818823f79d3d7ed3a3d94929.tar.bz2 | |
Removed dependency of QmlContext to QmlCompiledComponent
Store component url directly in context, instead of referencing the
associated QmlCompiledComponent. In addition, allow to explicitly set
the base url to a context. This is needed for Bauhaus.
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 72d4e08..0a56636 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -451,8 +451,7 @@ QObject *QmlComponent::beginCreate(QmlContext *context) QmlContext *ctxt = new QmlContext(context, 0); - static_cast<QmlContextPrivate*>(ctxt->d_ptr)->component = d->cc; - static_cast<QmlContextPrivate*>(ctxt->d_ptr)->component->addref(); + static_cast<QmlContextPrivate*>(ctxt->d_ptr)->url = d->cc->url; ctxt->activate(); QmlVME vme; |