summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlvmemetaobject.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-06-10 04:57:51 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-06-10 04:57:51 (GMT)
commit4dc4cfac667389efda4a43df5ff8cfa4ba305a2f (patch)
tree5c937ab2e510edb7a359b225132544d938a884a9 /src/declarative/qml/qmlvmemetaobject.cpp
parent29496148abe8506fbf50c99e9a210095c5115a14 (diff)
downloadQt-4dc4cfac667389efda4a43df5ff8cfa4ba305a2f.zip
Qt-4dc4cfac667389efda4a43df5ff8cfa4ba305a2f.tar.gz
Qt-4dc4cfac667389efda4a43df5ff8cfa4ba305a2f.tar.bz2
Support URLs directly (not just as strings), so they are correctly resolved.
URLs expressed as strings (possible relative) are resolved relative to the component in which the string expression is converted to a url value. All items are converted to use QUrl properties, except SqlConnection, where the databasename is only a special-case URL (this may need further consideration).
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject.cpp')
-rw-r--r--src/declarative/qml/qmlvmemetaobject.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
index 58708cf..0117448 100644
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ b/src/declarative/qml/qmlvmemetaobject.cpp
@@ -134,6 +134,9 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int id, void **a)
case QVariant::String:
*reinterpret_cast<QString *>(a[0]) = data[propId].toString();
break;
+ case QVariant::Url:
+ *reinterpret_cast<QUrl *>(a[0]) = data[propId].toUrl();
+ break;
case QVariant::Color:
*reinterpret_cast<QColor *>(a[0]) = data[propId].value<QColor>();
break;