diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-11 16:12:35 +0200 |
| commit | d0eb444a49f6064ecb896f62276e060cd8a4b1e8 (patch) | |
| tree | 34d8dd637baf665225ada73e76604531cd2c75e5 /src/corelib/tools/qelapsedtimer.cpp | |
| parent | da0cb32b8ee7cc4a991a59420a411898e63a660e (diff) | |
| parent | 894f86709080fe8d20875b402adce679963c49c2 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib8cfeee7d9ca15e8ad520e428b72c200827a8628
Diffstat (limited to 'src/corelib/tools/qelapsedtimer.cpp')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp index bdca60757f7..1da85fce96c 100644 --- a/src/corelib/tools/qelapsedtimer.cpp +++ b/src/corelib/tools/qelapsedtimer.cpp @@ -204,13 +204,13 @@ QT_BEGIN_NAMESPACE /*! \fn bool QElapsedTimer::operator ==(const QElapsedTimer &other) const - Returns true if this object and \a other contain the same time. + Returns \c true if this object and \a other contain the same time. */ /*! \fn bool QElapsedTimer::operator !=(const QElapsedTimer &other) const - Returns true if this object and \a other contain different times. + Returns \c true if this object and \a other contain different times. */ static const qint64 invalidData = Q_INT64_C(0x8000000000000000); @@ -230,7 +230,7 @@ void QElapsedTimer::invalidate() Q_DECL_NOTHROW } /*! - Returns false if this object was invalidated by a call to invalidate() and + Returns \c false if this object was invalidated by a call to invalidate() and has not been restarted since. \sa invalidate(), start(), restart() @@ -241,7 +241,7 @@ bool QElapsedTimer::isValid() const Q_DECL_NOTHROW } /*! - Returns true if this QElapsedTimer has already expired by \a timeout + Returns \c true if this QElapsedTimer has already expired by \a timeout milliseconds (that is, more than \a timeout milliseconds have elapsed). The value of \a timeout can be -1 to indicate that this timer does not expire, in which case this function will always return false. |