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).

1 files changed, 0 insertions, 6 deletions

diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp
index 0d5b796..d8d9ba1 100644
--- a/src/declarative/util/qfxview.cpp
+++ b/src/declarative/util/qfxview.cpp
@@ -84,11 +84,6 @@ static QVariant stringToKeySequence(const QString &str)
     return QVariant::fromValue(QKeySequence(str));
 }
 
-static QVariant stringToUrl(const QString &str)
-{
-    return QVariant(QUrl(str));
-}
-
 class QFxViewPrivate
 {
 public:
@@ -166,7 +161,6 @@ void QFxViewPrivate::init()
     QmlMetaType::registerCustomStringConverter(QVariant::Pixmap, &stringToPixmap);
     QmlMetaType::registerCustomStringConverter(QVariant::Icon, &stringToIcon);
     QmlMetaType::registerCustomStringConverter(QVariant::KeySequence, &stringToKeySequence);
-    QmlMetaType::registerCustomStringConverter(QVariant::Url, &stringToUrl);
 
 #ifdef Q_ENABLE_PERFORMANCE_LOG
     QFxPerfTimer<QFxPerf::FontDatabase> perf;