diff options
| -rw-r--r-- | src/corelib/thread/qthread.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/thread/qthread.h | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index feb9c2281c..e0d252b8ee 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -989,12 +989,6 @@ void QThread::setEventDispatcher(QAbstractEventDispatcher *eventDispatcher) \fn bool QThread::wait(unsigned long time) \overload */ -bool QThread::wait(unsigned long time) -{ - if (time == std::numeric_limits<unsigned long>::max()) - return wait(QDeadlineTimer(QDeadlineTimer::Forever)); - return wait(QDeadlineTimer(time)); -} #if QT_CONFIG(thread) diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 49224c81e6..7d268cffc9 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -115,8 +115,12 @@ public Q_SLOTS: public: bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever)); - // ### Qt6 inline this function - bool wait(unsigned long time); + bool wait(unsigned long time) + { + if (time == std::numeric_limits<unsigned long>::max()) + return wait(QDeadlineTimer(QDeadlineTimer::Forever)); + return wait(QDeadlineTimer(time)); + } static void sleep(unsigned long); static void msleep(unsigned long); |