From 39d8429b22d71786214e2b1ed7972f22d96fdfd1 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Tue, 27 Oct 2009 15:43:19 +1000
Subject: Fix remote content loading for absolute URLs (the test is pending...)

---
 src/declarative/qml/qmlcomponent.cpp | 9 ++++++---
 1 file 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;
-- 
cgit v0.12