diff options
author | Mitch Curtis <mitch.curtis@digia.com> | 2012-10-17 13:56:50 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-24 01:38:58 +0200 |
commit | b016597db844d0214734bb301c1e101261f4c724 (patch) | |
tree | 7c6a59684c15f2784d29cd05d817abf7a1433191 /src | |
parent | 8310533975fc3cafd796ca3b1266d6777137b2d0 (diff) |
Return invalid datetime when calling addMSecs with invalid QDateTime.
This is in line with what QTime::addMSecs and QDate::addDays do, for
example.
Change-Id: I902112486727f74f669a97bde6c42028e0838f8d
Reviewed-by: Jon Severinsson <jon@severinsson.net>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/tools/qdatetime.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 7845273cb8..7d18e93dce 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2692,6 +2692,9 @@ QDateTime QDateTime::addYears(int nyears) const QDateTime QDateTimePrivate::addMSecs(const QDateTime &dt, qint64 msecs) { + if (!dt.isValid()) + return QDateTime(); + QDate utcDate; QTime utcTime; dt.d->getUTC(utcDate, utcTime); @@ -2742,6 +2745,8 @@ void QDateTimePrivate::addMSecs(QDate &utcDate, QTime &utcTime, qint64 msecs) 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() */ @@ -2755,6 +2760,8 @@ QDateTime QDateTime::addSecs(qint64 s) const 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 |