From bda7b2a444562ca41ef54910163b74b034fab81c Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 12 Jan 2023 10:06:35 +0100 Subject: QmlCompiler: Handle various date and time conversions correctly We can coerce QDateTime, QDate and QTime into each other because they would all be represented by a Date object in JavaScript. Furthermore we can coerce them all to QString. Technically, we could also coerce strings to all of them, but we don't want to because that is terrible. Fixes: QTBUG-109380 Change-Id: I176bfb5b715a6a6750cb5918c44261fa23fb8832 Reviewed-by: Qt CI Bot Reviewed-by: Fabian Kosmale Reviewed-by: Sami Shalayel --- src/qmlcompiler/qqmljscompiler.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/qmlcompiler/qqmljscompiler.cpp') diff --git a/src/qmlcompiler/qqmljscompiler.cpp b/src/qmlcompiler/qqmljscompiler.cpp index 5ee7ec90b6..964c01c1a2 100644 --- a/src/qmlcompiler/qqmljscompiler.cpp +++ b/src/qmlcompiler/qqmljscompiler.cpp @@ -752,6 +752,7 @@ QQmlJSAotFunction QQmlJSAotCompiler::globalCode() const u"QtQml/qqmllist.h"_s, u"QtCore/qdatetime.h"_s, + u"QtCore/qtimezone.h"_s, u"QtCore/qobject.h"_s, u"QtCore/qstring.h"_s, u"QtCore/qstringlist.h"_s, -- cgit v1.2.3