Return a string from resolvedUrl() to match 4.x behavior

Task-number: QTBUG-20960
Change-Id: I9ae99ada5c9bbe7498df24908c6acd202ca73a15
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
index 1ced8687ff..918fd527b0 100644
--- a/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
+++ b/src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp
@@ -676,12 +676,12 @@ v8::Handle<v8::Value> resolvedUrl(const v8::Arguments &args)
     if (p) {
         QDeclarativeContextData *ctxt = V8ENGINE()->callingContext();
         if (ctxt)
-            return V8ENGINE()->fromVariant(ctxt->resolvedUrl(url));
+            return V8ENGINE()->toString(ctxt->resolvedUrl(url).toString());
         else
-            return V8ENGINE()->fromVariant(url);
+            return V8ENGINE()->toString(url.toString());
     }
 
-    return V8ENGINE()->fromVariant(e->baseUrl().resolved(url));
+    return V8ENGINE()->toString(e->baseUrl().resolved(url).toString());
 }
 
 /*!