diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 08:08:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-24 08:08:40 (GMT) |
| commit | e5453023ec31cada0730e5b53fd11ac1d849af73 (patch) | |
| tree | 7e257da76cdc190eddddd01f57f05b67f852bd3b /src/corelib/tools/qdatetime.h | |
| parent | 2fccc31367b207cff68de063d9f3d55a993cde42 (diff) | |
| parent | 87340d6327188d79f81592031c1d648fa52932be (diff) | |
| download | Qt-e5453023ec31cada0730e5b53fd11ac1d849af73.zip Qt-e5453023ec31cada0730e5b53fd11ac1d849af73.tar.gz Qt-e5453023ec31cada0730e5b53fd11ac1d849af73.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (119 commits)
Bearer management documentation.
Bearer management changes from Qt Mobility (6fb31d1e).
Remove extraneous semi-colon.
Use the default codec with QString::vsprintf()
Fix build with QT_NO_DOCKWIDGET
Fix the test of QDirIterator with NoDot and NoDotDot
Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot
QFSFileEngine: don't look through NTFS junctions
After showing modal windows, WM_LBUTTONUP for double click is ignored.
Possible fix for missing QML properties in the qt.qhp file.
Use standard theme icons in Linguist where possible
Use more standard icons from the theme in Assistant
Use more standard icons for standard actions in Designer
Drag & drop operations wont end while using Remote Desktop sessions
_close(fd) closes the associated handle and not the other way around
Fixed locale mapping on Symbian.
Revert change 7bf4512659 on Cocoa.
Extended the high_attributes array, since we have more than 127 widget attributes now.
Added instructions for MinGW users wanting to build the MySQL driver.
Designer: Fix broken resource view.
...
Diffstat (limited to 'src/corelib/tools/qdatetime.h')
| -rw-r--r-- | src/corelib/tools/qdatetime.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 6fdc855..ef5968e 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -261,11 +261,13 @@ public: int utcOffset() const; static QDateTime currentDateTime(); + static QDateTime currentDateTimeUtc(); #ifndef QT_NO_DATESTRING static QDateTime fromString(const QString &s, Qt::DateFormat f = Qt::TextDate); static QDateTime fromString(const QString &s, const QString &format); #endif static QDateTime fromTime_t(uint secsSince1Jan1970UTC); + static qint64 currentMsecsSinceEpoch(); #ifdef QT3_SUPPORT inline QT3_SUPPORT void setTime_t(uint secsSince1Jan1970UTC, Qt::TimeSpec spec) { |