summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-07-09 06:59:08 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-07-09 06:59:08 (GMT)
commit1b4c6795c628d4d76ff846977fdc4396ad5d9bda (patch)
tree87239d81fc169e2699a76a9dec88e21767e23867 /src
parentb4ec836efcb36313222e0d758f609439509cf5ba (diff)
downloadQt-1b4c6795c628d4d76ff846977fdc4396ad5d9bda.zip
Qt-1b4c6795c628d4d76ff846977fdc4396ad5d9bda.tar.gz
Qt-1b4c6795c628d4d76ff846977fdc4396ad5d9bda.tar.bz2
URL can convert from string or bytearray.
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/qmlbindablevalue.cpp2
1 files changed, 1 insertions, 1 deletions
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);