summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-30 12:45:56 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-30 12:45:56 (GMT)
commit3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04 (patch)
tree5328b5c3a27eecd86bd6f77e2e93881ccf293af8 /src
parent50781a66bd11c3201c7f9c520490dc352e239dac (diff)
parent2523d20027404fb09f6feb52b06b25ee604accb9 (diff)
downloadQt-3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04.zip
Qt-3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04.tar.gz
Qt-3c429633b6d7a1d59b6cb7569d2eaf7cbf2e1b04.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Doc: added since tag to QDateTime::msecsTo
Diffstat (limited to 'src')
-rw-r--r--src/corelib/tools/qdatetime.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index d915989..e33b7d5 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.