diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 08:14:28 (GMT) |
|---|---|---|
| committer | Casper van Donderen <casper.vandonderen@nokia.com> | 2011-08-31 08:14:28 (GMT) |
| commit | 9c5f08452da280a90de48d0fa3862748cc428df4 (patch) | |
| tree | 38e6d4192e6fcf4e807727e05d4508ecb9ecedde /src/corelib/tools/qdatetime.cpp | |
| parent | 76d680844382ea24d40caaf9e0349e7b5af69ada (diff) | |
| parent | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff) | |
| download | Qt-9c5f08452da280a90de48d0fa3862748cc428df4.zip Qt-9c5f08452da280a90de48d0fa3862748cc428df4.tar.gz Qt-9c5f08452da280a90de48d0fa3862748cc428df4.tar.bz2 | |
Merge remote branch 'mainline/4.8'
Conflicts:
tools/qdoc3/cppcodemarker.cpp
tools/qdoc3/node.cpp
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 8e4fb32..e1b4232 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2788,6 +2788,8 @@ int QDateTime::secsTo(const QDateTime &other) const } /*! + \since 4.7 + Returns the number of milliseconds from this datetime to the \a other datetime. If the \a other datetime is earlier than this datetime, the value returned is negative. |