Merge 5.9 into 5.9.1

Change-Id: I4154bf5f6f0b74176e333541372511d47d408546

1 files changed, 12 insertions, 0 deletions

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index dc6caf505b..8c62196128 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -512,6 +512,18 @@ 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;
+            }
+            case QVariant::DateTime:
+            {
+                QDateTime dt = v.value<QDateTime>();
+                result = dt.toString(Qt::ISODateWithMs);
+                break;
+            }
             default:
                 result = v.toString();
             }