From 99d4f0026f90681974f6fd1d23941e5b69024796 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 29 Dec 2016 18:59:04 +0100 Subject: Make the stub implementation of QThread compile again MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We cannot inline methods of QThreadPrivate because QThreadData has to be declared before. The global QThreadData needs to be accessible to QThreadData::clearCurrentThreadData(), and QAdoptedThread::run() has to be moved inside the #ifndef QT_NO_THREAD block as run() doesn't exist in the stub and Q_DECL_OVERRIDE would be wrong. We also fix the QThreadData::current() method to take and use the same parameters as in the non-stub case. Change-Id: Id29ca44b11fa95ed2df7cc39243a07ce7d3c455e Reviewed-by: Ulf Hermann Reviewed-by: Oswald Buddenhagen Reviewed-by: Morten Johan Sørvig --- src/corelib/thread/qthread.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/corelib/thread/qthread.h') diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 19951e844a..83c3329cc0 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -251,6 +251,9 @@ public: static void msleep(unsigned long); static void usleep(unsigned long); + QAbstractEventDispatcher *eventDispatcher() const; + void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher); + protected: QThread(QThreadPrivate &dd, QObject *parent = nullptr); -- cgit v1.2.3