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

Conflicts:
	.qmake.conf
	src/quick/doc/src/qmltypereference.qdoc

Change-Id: Ia58f1c5a98309c32ef8d8e5c893faf261215f19f

1 files changed, 6 insertions, 0 deletions

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 2a567fac8d..90d11e9734 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -554,6 +554,12 @@ void QuickTestResult::stringify(QQmlV4Function *args)
                 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();
             }