diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-31 23:44:10 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-31 23:44:10 (GMT) |
| commit | 5c32e4129e331a95187b65c2ab16074d21d8d96f (patch) | |
| tree | b86b6297b83f95860c7402b879e9b4691f485070 /src/corelib/tools/qdatetime.h | |
| parent | 1bb04f8c0675449a851cf636680951bd0a142507 (diff) | |
| parent | 5fd91a33ddfb9d8419eb7b3592087e9b5d15df58 (diff) | |
| download | Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.zip Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.tar.gz Qt-5c32e4129e331a95187b65c2ab16074d21d8d96f.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/corelib/tools/qdatetime.h')
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index ef5968e..f445f1c 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -230,10 +230,12 @@ public: QDate date() const; QTime time() const; Qt::TimeSpec timeSpec() const; + qint64 toMSecsSinceEpoch() const; uint toTime_t() const; void setDate(const QDate &date); void setTime(const QTime &time); void setTimeSpec(Qt::TimeSpec spec); + void setMSecsSinceEpoch(qint64 msecs); void setTime_t(uint secsSince1Jan1970UTC); #ifndef QT_NO_DATESTRING QString toString(Qt::DateFormat f = Qt::TextDate) const; @@ -267,7 +269,8 @@ public: static QDateTime fromString(const QString &s, const QString &format); #endif static QDateTime fromTime_t(uint secsSince1Jan1970UTC); - static qint64 currentMsecsSinceEpoch(); + static QDateTime fromMSecsSinceEpoch(qint64 msecs); + static qint64 currentMSecsSinceEpoch(); #ifdef QT3_SUPPORT inline QT3_SUPPORT void setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec) { |