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 <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>

4 files changed, 75 insertions, 0 deletions

diff --git a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
index fa06745d34..e66af303ca 100644
--- a/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
+++ b/tests/auto/qml/qmlcppcodegen/data/CMakeLists.txt
@@ -79,6 +79,7 @@ set(qml_files
     conversions2.qml
     curlygrouped.qml
     cycleHead.qml
+    dateConversions.qml
     deadShoeSize.qml
     deadStoreLoop.qml
     dialog.qml
diff --git a/tests/auto/qml/qmlcppcodegen/data/dateConversions.qml b/tests/auto/qml/qmlcppcodegen/data/dateConversions.qml
new file mode 100644
index 0000000000..38a34f7487
--- /dev/null
+++ b/tests/auto/qml/qmlcppcodegen/data/dateConversions.qml
@@ -0,0 +1,25 @@
+pragma Strict
+import QtQml
+import TestTypes
+
+QtObject {
+    property date date: Druggeljug.myDate
+    property date time: Druggeljug.myTime
+
+    property string dateString: date
+    property string timeString: time
+
+    function shuffle() {
+        Druggeljug.myDate = date;
+        Druggeljug.myTime = time;
+
+        dateString = Druggeljug.myDate;
+        timeString = Druggeljug.myTime;
+    }
+
+    function fool() {
+        var tmp = Druggeljug.myTime;
+        Druggeljug.myTime = Druggeljug.myDate;
+        Druggeljug.myDate = tmp;
+    }
+}
diff --git a/tests/auto/qml/qmlcppcodegen/data/druggeljug.h b/tests/auto/qml/qmlcppcodegen/data/druggeljug.h
index 70553e9b71..04f8301718 100644
--- a/tests/auto/qml/qmlcppcodegen/data/druggeljug.h
+++ b/tests/auto/qml/qmlcppcodegen/data/druggeljug.h
@@ -2,6 +2,7 @@
 #define DRUGGELJUG_H
 
 #include <QtCore/qobject.h>
+#include <QtCore/qdatetime.h>
 #include <qqmlregistration.h>
 
 #define STORE_FUNCTION(type, name, member, signal) \
@@ -29,6 +30,9 @@ class Druggeljug : public QObject
     Q_PROPERTY(qint64 myInt64 MEMBER m_myInt64 NOTIFY myInt64Changed FINAL)
     Q_PROPERTY(quint64 myUint64 MEMBER m_myUint64 NOTIFY myUint64Changed FINAL)
 
+    Q_PROPERTY(QTime myTime MEMBER m_myTime NOTIFY myTimeChanged)
+    Q_PROPERTY(QDate myDate MEMBER m_myDate NOTIFY myDateChanged)
+
 public:
     Druggeljug(QObject* parent = nullptr) : QObject(parent) {}
 
@@ -43,6 +47,9 @@ public:
     STORE_FUNCTION(qint64, storeMyInt64, m_myInt64, myInt64Changed)
     STORE_FUNCTION(quint64, storeMyUint64, m_myUint64, myUint64Changed)
 
+    QTime myTime() const { return m_myTime; }
+    QDate myDate() const { return m_myDate; }
+
 private:
     int m_myInt = 0;
     uint m_myUint = 0;
@@ -55,6 +62,9 @@ private:
     qint64 m_myInt64 = 0;
     quint64 m_myUint64 = 0;
 
+    QTime m_myTime = QTime(11, 55, 0);
+    QDate m_myDate = QDate(2017, 9, 3);
+
 signals:
     void myIntChanged(int);
     void myUintChanged(uint);
@@ -66,6 +76,8 @@ signals:
     void myUint32Changed(quint32);
     void myInt64Changed(qint64);
     void myUint64Changed(quint64);
+    void myTimeChanged();
+    void myDateChanged();
 };
 
 #endif
diff --git a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
index 65e882a089..1e88ecd7b7 100644
--- a/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
+++ b/tests/auto/qml/qmlcppcodegen/tst_qmlcppcodegen.cpp
@@ -1,5 +1,6 @@
 // Copyright (C) 2021 The Qt Company Ltd.
 
+#include "data/druggeljug.h"
 #include <data/birthdayparty.h>
 #include <data/cppbaseclass.h>
 #include <data/enumproblems.h>
@@ -160,6 +161,7 @@ private slots:
     void infinitiesToInt();
     void equalityVarAndNonStorable();
     void equalityQObjects();
+    void dateConversions();
 };
 
 void tst_QmlCppCodegen::initTestCase()
@@ -3088,6 +3090,41 @@ void tst_QmlCppCodegen::equalityQObjects()
     QVERIFY(object->property("compareObjectWithNullObject").toBool());
 }
 
+void tst_QmlCppCodegen::dateConversions()
+{
+    QQmlEngine engine;
+    QQmlComponent c(&engine, QUrl(u"qrc:/qt/qml/TestTypes/dateConversions.qml"_s));
+    QVERIFY2(c.isReady(), qPrintable(c.errorString()));
+    QScopedPointer<QObject> o(c.create());
+
+    Druggeljug *ref = engine.singletonInstance<Druggeljug *>("TestTypes", "Druggeljug");
+
+    const QDateTime refDate = engine.coerceValue<QDate, QDateTime>(ref->myDate());
+    const QDateTime refTime = engine.coerceValue<QTime, QDateTime>(ref->myTime());
+
+    QCOMPARE(o->property("date").value<QDateTime>(), refDate);
+    QCOMPARE(o->property("time").value<QDateTime>(), refTime);
+
+    QCOMPARE(o->property("dateString").toString(), (engine.coerceValue<QDateTime, QString>(refDate)));
+    QCOMPARE(o->property("timeString").toString(), (engine.coerceValue<QDateTime, QString>(refTime)));
+
+    QMetaObject::invokeMethod(o.data(), "shuffle");
+
+    QCOMPARE(ref->myDate(), (engine.coerceValue<QDateTime, QDate>(refDate)));
+    QCOMPARE(ref->myTime(), (engine.coerceValue<QDateTime, QTime>(refTime)));
+
+    const QDate date = ref->myDate();
+    const QTime time = ref->myTime();
+
+    QCOMPARE(o->property("dateString").toString(), (engine.coerceValue<QDate, QString>(date)));
+    QCOMPARE(o->property("timeString").toString(), (engine.coerceValue<QTime, QString>(time)));
+
+    QMetaObject::invokeMethod(o.data(), "fool");
+
+    QCOMPARE(ref->myDate(), (engine.coerceValue<QTime, QDate>(time)));
+    QCOMPARE(ref->myTime(), (engine.coerceValue<QDate, QTime>(date)));
+}
+
 QTEST_MAIN(tst_QmlCppCodegen)
 
 #include "tst_qmlcppcodegen.moc"