QDateTime QDateTimePrivate::addMSecs(const QDateTime &dt, qint64 msecs)
{
+ if (!dt.isValid())
+ return QDateTime();
+
QDate utcDate;
QTime utcTime;
dt.d->getUTC(utcDate, utcTime);
later than the datetime of this object (or earlier if \a s is
negative).
+ If this datetime is invalid, an invalid datetime will be returned.
+
\sa addMSecs(), secsTo(), addDays(), addMonths(), addYears()
*/
later than the datetime of this object (or earlier if \a msecs is
negative).
+ If this datetime is invalid, an invalid datetime will be returned.
+
\sa addSecs(), msecsTo(), addDays(), addMonths(), addYears()
*/
QDateTime QDateTime::addMSecs(qint64 msecs) const
QTest::newRow("toPositive") << QDateTime(QDate(-1, 12, 31), QTime(23, 59, 59), Qt::UTC)
<< 1
<< QDateTime(QDate(1, 1, 1), QTime(0, 0, 0), Qt::UTC);
+
+ QTest::newRow("invalid") << invalidDateTime() << 1 << invalidDateTime();
}
void tst_QDateTime::addSecs()
QFETCH(int, nsecs);
QFETCH(QDateTime, result);
-#ifdef Q_OS_IRIX
- QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort);
-#endif
- QCOMPARE(dt.secsTo(result), (qint64)nsecs);
- QCOMPARE(result.secsTo(dt), (qint64)-nsecs);
- QVERIFY((dt == result) == (0 == nsecs));
- QVERIFY((dt != result) == (0 != nsecs));
- QVERIFY((dt < result) == (0 < nsecs));
- QVERIFY((dt <= result) == (0 <= nsecs));
- QVERIFY((dt > result) == (0 > nsecs));
- QVERIFY((dt >= result) == (0 >= nsecs));
+ if (dt.isValid()) {
+ #ifdef Q_OS_IRIX
+ QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort);
+ #endif
+ QCOMPARE(dt.secsTo(result), (qint64)nsecs);
+ QCOMPARE(result.secsTo(dt), (qint64)-nsecs);
+ QVERIFY((dt == result) == (0 == nsecs));
+ QVERIFY((dt != result) == (0 != nsecs));
+ QVERIFY((dt < result) == (0 < nsecs));
+ QVERIFY((dt <= result) == (0 <= nsecs));
+ QVERIFY((dt > result) == (0 > nsecs));
+ QVERIFY((dt >= result) == (0 >= nsecs));
+ } else {
+ QVERIFY(dt.secsTo(result) == 0);
+ QVERIFY(result.secsTo(dt) == 0);
+ }
}
void tst_QDateTime::msecsTo_data()
QFETCH(int, nsecs);
QFETCH(QDateTime, result);
-#ifdef Q_OS_IRIX
- QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort);
-#endif
- QCOMPARE(dt.msecsTo(result), qint64(nsecs) * 1000);
- QCOMPARE(result.msecsTo(dt), -qint64(nsecs) * 1000);
- QVERIFY((dt == result) == (0 == (qint64(nsecs) * 1000)));
- QVERIFY((dt != result) == (0 != (qint64(nsecs) * 1000)));
- QVERIFY((dt < result) == (0 < (qint64(nsecs) * 1000)));
- QVERIFY((dt <= result) == (0 <= (qint64(nsecs) * 1000)));
- QVERIFY((dt > result) == (0 > (qint64(nsecs) * 1000)));
- QVERIFY((dt >= result) == (0 >= (qint64(nsecs) * 1000)));
+ if (dt.isValid()) {
+ #ifdef Q_OS_IRIX
+ QEXPECT_FAIL("cet4", "IRIX databases say 1970 had DST", Abort);
+ #endif
+ QCOMPARE(dt.msecsTo(result), qint64(nsecs) * 1000);
+ QCOMPARE(result.msecsTo(dt), -qint64(nsecs) * 1000);
+ QVERIFY((dt == result) == (0 == (qint64(nsecs) * 1000)));
+ QVERIFY((dt != result) == (0 != (qint64(nsecs) * 1000)));
+ QVERIFY((dt < result) == (0 < (qint64(nsecs) * 1000)));
+ QVERIFY((dt <= result) == (0 <= (qint64(nsecs) * 1000)));
+ QVERIFY((dt > result) == (0 > (qint64(nsecs) * 1000)));
+ QVERIFY((dt >= result) == (0 >= (qint64(nsecs) * 1000)));
+ } else {
+ QVERIFY(dt.msecsTo(result) == 0);
+ QVERIFY(result.msecsTo(dt) == 0);
+ }
}
void tst_QDateTime::currentDateTime()