diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qdeadlinetimer.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qdeadlinetimer.h | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index e3d0185004..64e73d23c5 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -213,7 +213,7 @@ QT_BEGIN_NAMESPACE \value TabletMove Wacom tablet move (QTabletEvent). \value TabletPress Wacom tablet press (QTabletEvent). \value TabletRelease Wacom tablet release (QTabletEvent). - \value OkRequest Ok button in decoration pressed. Supported only for Windows CE. + \omitvalue OkRequest \value TabletEnterProximity Wacom tablet enter proximity event (QTabletEvent), sent to QApplication. \value TabletLeaveProximity Wacom tablet leave proximity event (QTabletEvent), sent to QApplication. \omitvalue ThemeChange diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp index 7906b29ece..957d985c31 100644 --- a/src/corelib/kernel/qdeadlinetimer.cpp +++ b/src/corelib/kernel/qdeadlinetimer.cpp @@ -408,16 +408,14 @@ void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::Time */ /*! + \fn bool QDeadlineTimer::isForever() const + Returns true if this QDeadlineTimer object never expires, false otherwise. For timers that never expire, remainingTime() always returns -1 and deadline() returns the maximum value. \sa ForeverConstant, hasExpired(), remainingTime() */ -bool QDeadlineTimer::isForever() const Q_DECL_NOTHROW -{ - return t1 == (std::numeric_limits<qint64>::max)(); -} /*! Returns true if this QDeadlineTimer object has expired, false if there diff --git a/src/corelib/kernel/qdeadlinetimer.h b/src/corelib/kernel/qdeadlinetimer.h index ac8a09ba97..3b97b89359 100644 --- a/src/corelib/kernel/qdeadlinetimer.h +++ b/src/corelib/kernel/qdeadlinetimer.h @@ -65,7 +65,8 @@ public: void swap(QDeadlineTimer &other) { qSwap(t1, other.t1); qSwap(t2, other.t2); qSwap(type, other.type); } - bool isForever() const Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR bool isForever() const Q_DECL_NOTHROW + { return t1 == (std::numeric_limits<qint64>::max)(); } bool hasExpired() const Q_DECL_NOTHROW; Qt::TimerType timerType() const Q_DECL_NOTHROW |