From 1b4c6795c628d4d76ff846977fdc4396ad5d9bda Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Thu, 9 Jul 2009 16:59:08 +1000
Subject: URL can convert from string or bytearray.

---
 src/declarative/qml/qmlbindablevalue.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlbindablevalue.cpp b/src/declarative/qml/qmlbindablevalue.cpp
index f447d4f..ef9eb55 100644
--- a/src/declarative/qml/qmlbindablevalue.cpp
+++ b/src/declarative/qml/qmlbindablevalue.cpp
@@ -152,7 +152,7 @@ void QmlBindableValue::update()
             }
 
             if (d->property.propertyType() == QVariant::Url && 
-                value.canConvert(QVariant::String) && !value.isNull()) 
+                (value.type() == QVariant::String || value.type() == QVariant::ByteArray) && !value.isNull()) 
                 value.setValue(context()->resolvedUrl(QUrl(value.toString())));
 
             d->property.write(value);
-- 
cgit v0.12