Merge remote-tracking branch 'origin/5.9' into dev

Conflicts:
	src/qml/compiler/qv4codegen.cpp

Change-Id: I3c41b9fc9ba7d41741e4dd400402ae80dd7726d9

1 files changed, 6 insertions, 0 deletions

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 3650df8f3a..2a567fac8d 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -548,6 +548,12 @@ void QuickTestResult::stringify(QQmlV4Function *args)
                 result = QString::fromLatin1("Qt.vector3d(%1, %2, %3)").arg(v3d.x()).arg(v3d.y()).arg(v3d.z());
                 break;
             }
+            case QVariant::Url:
+            {
+                QUrl url = v.value<QUrl>();
+                result = QString::fromLatin1("Qt.url(%1)").arg(url.toString());
+                break;
+            }
             default:
                 result = v.toString();
             }