diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-09-03 11:10:58 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-12 23:35:43 +0200 |
| commit | d24174918f1f224cd32f41b1a640a9db27965e64 (patch) | |
| tree | 023dd6159a37d3c4ec784be46903061bf75d8907 /src/corelib/thread/qthread.h | |
| parent | 14dece57e9d63fe4a1be5e8a1fc1816c4a9b7fe6 (diff) | |
Inline one method as per ###Qt6
Change-Id: I4bf0ddf4ddf4044a60d881a57ef63b96d4bac262
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/thread/qthread.h')
| -rw-r--r-- | src/corelib/thread/qthread.h | 8 |
1 files changed, 6 insertions, 2 deletions
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); |