From: Ivailo Monev Date: Fri, 26 Jul 2019 19:14:38 +0000 (+0000) Subject: add missing QThreadData::clearCurrentThreadData() stub X-Git-Tag: 4.12.0~5318 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1377e407a365c6d70d38f939d0dea25b945b8a7c;p=kde%2FKatie.git add missing QThreadData::clearCurrentThreadData() stub Signed-off-by: Ivailo Monev --- diff --git a/src/core/thread/qthread.cpp b/src/core/thread/qthread.cpp index afbfb1e81..40090406f 100644 --- a/src/core/thread/qthread.cpp +++ b/src/core/thread/qthread.cpp @@ -694,16 +694,22 @@ QThread *QThread::currentThread() return QThreadData::current()->thread; } +static QThreadData *currentdata = Q_NULLPTR; + QThreadData* QThreadData::current() { - static QThreadData *data = 0; // reinterpret_cast(pthread_getspecific(current_thread_data_key)); - if (!data) { + if (!currentdata) { QScopedPointer newdata(new QThreadData); newdata->thread = new QAdoptedThread(newdata.data()); - data = newdata.take(); - data->deref(); + currentdata = newdata.take(); + currentdata->deref(); } - return data; + return currentdata; +} + +void QThreadData::clearCurrentThreadData() +{ + currentdata = Q_NULLPTR; } /*! \internal