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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 57 insertions, 4 deletions

diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index aba4651379..9eae1f10ea 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -262,6 +262,8 @@ private slots:
     void timeSpec();
     void timeSpecBug();
     void timeSpecInit();
+    void setDateTime_data();
+    void setDateTime();
 
     void monthEdgeCase();
     void setLocale();
@@ -2303,7 +2305,7 @@ void tst_QDateTimeEdit::mousePress()
     QRect rectUp = testWidget->style()->subControlRect(QStyle::CC_SpinBox, &so, QStyle::SC_SpinBoxUp, testWidget);
 
     // Send mouseClick to center of SC_SpinBoxUp
-    QTest::mouseClick(testWidget, Qt::LeftButton, 0, rectUp.center());
+    QTest::mouseClick(testWidget, Qt::LeftButton, {}, rectUp.center());
     QCOMPARE(testWidget->date().year(), 2005);
 }
 
@@ -2916,7 +2918,8 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.editable = true;
     opt.subControls = QStyle::SC_ComboBoxArrow;
     QRect rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, testWidget);
-    QTest::mouseClick(testWidget, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
+    QTest::mouseClick(testWidget, Qt::LeftButton, {},
+                      QPoint(rect.left() + rect.width() / 2, rect.top() + rect.height() / 2));
     QWidget *wid = testWidget->findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(wid != 0);
     testWidget->hide();
@@ -2928,7 +2931,8 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.initFrom(&timeEdit);
     opt.subControls = QStyle::SC_ComboBoxArrow;
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &timeEdit);
-    QTest::mouseClick(&timeEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
+    QTest::mouseClick(&timeEdit, Qt::LeftButton, {},
+                      QPoint(rect.left() + rect.width() / 2, rect.top() + rect.height() / 2));
     QWidget *wid2 = timeEdit.findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(!wid2);
     timeEdit.hide();
@@ -2942,7 +2946,8 @@ void tst_QDateTimeEdit::calendarPopup()
     opt.initFrom(&dateEdit);
     opt.subControls = QStyle::SC_ComboBoxArrow;
     rect = style->subControlRect(QStyle::CC_ComboBox, &opt, QStyle::SC_ComboBoxArrow, &dateEdit);
-    QTest::mouseClick(&dateEdit, Qt::LeftButton, 0, QPoint(rect.left()+rect.width()/2, rect.top()+rect.height()/2));
+    QTest::mouseClick(&dateEdit, Qt::LeftButton, {},
+                      QPoint(rect.left() + rect.width() / 2, rect.top() + rect.height() / 2));
     QWidget *wid3 = dateEdit.findChild<QWidget *>("qt_datetimedit_calendar");
     QVERIFY(!wid3);
     dateEdit.hide();
@@ -3473,6 +3478,54 @@ void tst_QDateTimeEdit::timeSpecInit()
     QCOMPARE(widget.dateTime(), utc);
 }
 
+void tst_QDateTimeEdit::setDateTime_data()
+{
+    QTest::addColumn<Qt::TimeSpec>("spec");
+    QDateTime localNoon(QDate(2019, 12, 24), QTime(12, 0), Qt::LocalTime);
+#if 0 // Not yet supported
+    QTest::addColumn<int>("offset");
+    QTest::addColumn<QByteArray>("zoneName");
+
+    QTest::newRow("OffsetFromUTC/LocalTime")
+        << Qt::OffsetFromUTC << 7200 << ""
+        << localNoon << localNoon.toOffsetFromUtc(7200);
+#if QT_CONFIG(timezone)
+    QTest::newRow("TimeZone/LocalTime")
+        << Qt::TimeZone << 0 << "Europe/Berlin"
+        << localNoon << localNoon.toTimeZone(QTimeZone("Europe/Berlin"));
+#endif
+#endif // unsupported
+    QTest::addColumn<QDateTime>("store");
+    QTest::addColumn<QDateTime>("expect");
+    QTest::newRow("LocalTime/LocalTime")
+        << Qt::LocalTime // << 0 << ""
+        << localNoon << localNoon;
+    QTest::newRow("LocalTime/UTC")
+        << Qt::LocalTime // << 0 << ""
+        << localNoon.toUTC() << localNoon;
+    QTest::newRow("UTC/LocalTime")
+        << Qt::UTC // << 0 << ""
+        << localNoon << localNoon.toUTC();
+    QTest::newRow("UTC/UTC")
+        << Qt::UTC // << 0 << ""
+        << localNoon.toUTC() << localNoon.toUTC();
+}
+
+void tst_QDateTimeEdit::setDateTime()
+{
+    QFETCH(const Qt::TimeSpec, spec);
+#if 0 // Not yet supported
+    QFETCH(const int, offset);
+    QFETCH(const QByteArray, zoneName);
+#endif // configuring the spec, when OffsetFromUTC or TimeZone
+    QFETCH(const QDateTime, store);
+    QFETCH(const QDateTime, expect);
+    QDateTimeEdit editor;
+    editor.setTimeSpec(spec);
+    editor.setDateTime(store);
+    QCOMPARE(editor.dateTime(), expect);
+}
+
 void tst_QDateTimeEdit::cachedDayTest()
 {
     testWidget->setDisplayFormat("MM/dd");