Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I9953c1ca16862184c2373027e946c482ce8e6f0e

1 files changed, 20 insertions, 22 deletions

diff --git a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
index 99176dc68d..216ae1f79e 100644
--- a/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/time/qdatetime/tst_qdatetime.cpp
@@ -360,6 +360,7 @@ void tst_QDateTime::ctor()
 
 void tst_QDateTime::operator_eq()
 {
+    QVERIFY(QDateTime() != QDateTime(QDate(1970, 1, 1), QTime(0, 0))); // QTBUG-79006
     QDateTime dt1(QDate(2004, 3, 24), QTime(23, 45, 57), Qt::UTC);
     QDateTime dt2(QDate(2005, 3, 11), QTime(), Qt::UTC);
     dt2 = dt1;
@@ -1675,29 +1676,30 @@ void tst_QDateTime::currentDateTimeUtc2()
 void tst_QDateTime::toSecsSinceEpoch_data()
 {
     QTest::addColumn<QString>("dateTimeStr");
-    QTest::addColumn<bool>("res");
+    QTest::addColumn<bool>("valid");
 
-    QTest::newRow( "data1" ) << str( 1800, 1, 1, 12, 0, 0 ) << false;
-    QTest::newRow( "data2" ) << str( 1969, 1, 1, 12, 0, 0 ) << false;
+    QTest::newRow( "data1" ) << str( 1800, 1, 1, 12, 0, 0 ) << true;
+    QTest::newRow( "data2" ) << str( 1969, 1, 1, 12, 0, 0 ) << true;
     QTest::newRow( "data3" ) << str( 2002, 1, 1, 12, 0, 0 ) << true;
     QTest::newRow( "data4" ) << str( 2002, 6, 1, 12, 0, 0 ) << true;
     QTest::newRow( "data5" ) << QString("INVALID") << false;
     QTest::newRow( "data6" ) << str( 2038, 1, 1, 12, 0, 0 ) << true;
     QTest::newRow( "data7" ) << str( 2063, 4, 5, 12, 0, 0 ) << true; // the day of First Contact
-    QTest::newRow( "data8" ) << str( 2107, 1, 1, 12, 0, 0 )
-                          << bool( sizeof(uint) > 32 && sizeof(time_t) > 32 );
+    QTest::newRow( "data8" ) << str( 2107, 1, 1, 12, 0, 0 ) << true;
 }
 
 void tst_QDateTime::toSecsSinceEpoch()
 {
-    QFETCH( QString, dateTimeStr );
-    QDateTime datetime = dt( dateTimeStr );
-
-    qint64 asSecsSinceEpoch = datetime.toSecsSinceEpoch();
-    QCOMPARE(asSecsSinceEpoch, datetime.toMSecsSinceEpoch() / 1000);
+    QFETCH(const QString, dateTimeStr);
+    const QDateTime datetime = dt(dateTimeStr);
+    QFETCH(const bool, valid);
+    QCOMPARE(datetime.isValid(), valid);
 
-    QDateTime datetime2 = QDateTime::fromSecsSinceEpoch(asSecsSinceEpoch);
-    QCOMPARE(datetime, datetime2);
+    if (valid) {
+        const qint64 asSecsSinceEpoch = datetime.toSecsSinceEpoch();
+        QCOMPARE(asSecsSinceEpoch, datetime.toMSecsSinceEpoch() / 1000);
+        QCOMPARE(QDateTime::fromSecsSinceEpoch(asSecsSinceEpoch), datetime);
+    }
 }
 
 #if QT_DEPRECATED_SINCE(5, 8)
@@ -1725,14 +1727,10 @@ void tst_QDateTime::toTime_t()
     uint asTime_t = datetime.toTime_t();
     QFETCH( bool, res );
     if (res) {
-        QVERIFY( asTime_t != (uint)-1 );
+        QVERIFY(asTime_t != uint(-1));
+        QCOMPARE(QDateTime::fromTime_t(asTime_t), datetime);
     } else {
-        QVERIFY( asTime_t == (uint)-1 );
-    }
-
-    if ( asTime_t != (uint) -1 ) {
-        QDateTime datetime2 = QDateTime::fromTime_t( asTime_t );
-        QCOMPARE(datetime, datetime2);
+        QCOMPARE(asTime_t, uint(-1));
     }
 }
 #endif
@@ -1929,8 +1927,8 @@ void tst_QDateTime::operator_eqeq_data()
 
     QDateTime dateTime1(QDate(2012, 6, 20), QTime(14, 33, 2, 500));
     QDateTime dateTime1a = dateTime1.addMSecs(1);
-    QDateTime dateTime2(QDate(2012, 20, 6), QTime(14, 33, 2, 500));
-    QDateTime dateTime2a = dateTime2.addMSecs(-1);
+    QDateTime dateTime2(QDate(2012, 20, 6), QTime(14, 33, 2, 500)); // Invalid
+    QDateTime dateTime2a = dateTime2.addMSecs(-1); // Still invalid
     QDateTime dateTime3(QDate(1970, 1, 1), QTime(0, 0, 0, 0), Qt::UTC); // UTC epoch
     QDateTime dateTime3a = dateTime3.addDays(1);
     QDateTime dateTime3b = dateTime3.addDays(-1);
@@ -1946,7 +1944,7 @@ void tst_QDateTime::operator_eqeq_data()
     QTest::newRow("data2") << dateTime1a << dateTime1a << true << false;
     QTest::newRow("data3") << dateTime1 << dateTime2 << false << false;
     QTest::newRow("data4") << dateTime1 << dateTime1a << false << false;
-    QTest::newRow("data5") << dateTime2 << dateTime2a << false << false;
+    QTest::newRow("data5") << dateTime2 << dateTime2a << true << false;
     QTest::newRow("data6") << dateTime2 << dateTime3 << false << false;
     QTest::newRow("data7") << dateTime3 << dateTime3a << false << false;
     QTest::newRow("data8") << dateTime3 << dateTime3b << false << false;