diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-27 05:43:19 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-27 05:43:19 (GMT) |
| commit | 39d8429b22d71786214e2b1ed7972f22d96fdfd1 (patch) | |
| tree | 9045575ff343d2856e99c027b66364b811c711d3 /src/declarative/qml | |
| parent | b1a5b6c40c6c76d44d9afc24c6cddf1d2abf7b29 (diff) | |
| download | Qt-39d8429b22d71786214e2b1ed7972f22d96fdfd1.zip Qt-39d8429b22d71786214e2b1ed7972f22d96fdfd1.tar.gz Qt-39d8429b22d71786214e2b1ed7972f22d96fdfd1.tar.bz2 | |
Fix remote content loading for absolute URLs
(the test is pending...)
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 0894758..02c9b10 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -368,8 +368,9 @@ void QmlComponent::setData(const QByteArray &data, const QUrl &url) QmlCompositeTypeData *typeData = QmlEnginePrivate::get(d->engine)->typeManager.getImmediate(data, url); - if (typeData->status == QmlCompositeTypeData::Waiting) { - + if (typeData->status == QmlCompositeTypeData::Waiting + || typeData->status == QmlCompositeTypeData::WaitingResources) + { d->typeData = typeData; d->typeData->addWaiter(d); @@ -414,7 +415,9 @@ void QmlComponent::loadUrl(const QUrl &url) QmlCompositeTypeData *data = QmlEnginePrivate::get(d->engine)->typeManager.get(d->url); - if (data->status == QmlCompositeTypeData::Waiting) { + if (data->status == QmlCompositeTypeData::Waiting + || data->status == QmlCompositeTypeData::WaitingResources) + { d->typeData = data; d->typeData->addWaiter(d); d->progress = data->progress; |