diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/corelib/kernel/qdeadlinetimer.cpp | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/corelib/kernel/qdeadlinetimer.cpp')
| -rw-r--r-- | src/corelib/kernel/qdeadlinetimer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp index 06b56bb09bf..520153b2e56 100644 --- a/src/corelib/kernel/qdeadlinetimer.cpp +++ b/src/corelib/kernel/qdeadlinetimer.cpp @@ -438,8 +438,8 @@ inline bool TimeReference::toNanoseconds(qint64 *result) const For such objects, remainingTime() will return -1, deadline() will return the maximum value, and isForever() will return true. - The timer type \a timerType may be ignored, since the timer is already - expired. + The timer type \a timerType may be ignored, since the timer will never + expire. \sa ForeverConstant, hasExpired(), isForever(), remainingTime(), timerType() */ @@ -449,9 +449,9 @@ inline bool TimeReference::toNanoseconds(qint64 *result) const from the moment of the creation of this object, if msecs is positive. If \a msecs is zero, this QDeadlineTimer will be marked as expired, causing remainingTime() to return zero and deadline() to return an indeterminate - time point in the past. If \a msecs is -1, the timer will be set it to - never expire, causing remainingTime() to return -1 and deadline() to return - the maximum value. + time point in the past. If \a msecs is -1, the timer will be set to never + expire, causing remainingTime() to return -1 and deadline() to return the + maximum value. The QDeadlineTimer object will be constructed with the specified timer \a type. |