From e84c2895ff108b43515a5200a646610efea6d8da Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 14 Aug 2009 13:43:27 +1000
Subject: Make sure URLs specified in a state change are resolved.

---
 src/declarative/util/qmlsetproperties.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp
index 482405c..a08f4ba 100644
--- a/src/declarative/util/qmlsetproperties.cpp
+++ b/src/declarative/util/qmlsetproperties.cpp
@@ -48,6 +48,7 @@
 #include <private/qmlparser_p.h>
 #include <QtDeclarative/qmlexpression.h>
 #include <QtDeclarative/qmlbinding.h>
+#include <QtDeclarative/qmlcontext.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -314,6 +315,11 @@ QmlSetProperties::ActionList QmlSetProperties::actions()
 
         if (a.property.isValid()) {
             a.restore = restoreEntryValues();
+
+            if (a.property.propertyType() == QVariant::Url &&
+                (a.toValue.type() == QVariant::String || a.toValue.type() == QVariant::ByteArray) && !a.toValue.isNull())
+                a.toValue.setValue(qmlContext(this)->resolvedUrl(QUrl(a.toValue.toString())));  //### d->object's context?
+
             list << a;
         }
     }
-- 
cgit v0.12