1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline one method as per ###Qt6

Browse Source 
Change-Id: I4bf0ddf4ddf4044a60d881a57ef63b96d4bac262
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Lars Knoll 2020-09-03 11:10:58 +02:00
parent 14dece57e9
commit d24174918f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/thread/qthread.cpp
View File

@ -989,12 +989,6 @@ void QThread::setEventDispatcher(QAbstractEventDispatcher *eventDispatcher)
\fn bool QThread::wait(unsigned long time) \fn bool QThread::wait(unsigned long time)
\overload \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) #if QT_CONFIG(thread)

8
src/corelib/thread/qthread.h
View File

@ -115,8 +115,12 @@ public Q_SLOTS:
public: public:
bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever)); 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 sleep(unsigned long);
static void msleep(unsigned long); static void msleep(unsigned long);