diff options
author | Morten Johan Sørvig <morten.sorvig@qt.io> | 2018-07-02 22:24:35 +0200 |
---|---|---|
committer | Lorn Potter <lorn.potter@gmail.com> | 2018-08-17 00:35:03 +0000 |
commit | 67352c92761fcb2e2c6a98b24e1bf5f33805cb3a (patch) | |
tree | 6d085f8ef3556469891bef40e23660d84cf767ec /src/corelib/thread/qthread_p.h | |
parent | 0a06e1baf9e6da5308582b9dc928f4d9fea508d0 (diff) |
Merge QThread class definitions
We can reuse the main QThread definition for the no-thread
configuration and avoid having to keep them in sync.
Add stub definitions for member functions where needed.
Change-Id: I128db11684a6040d09c4a4ce114f1399cba523f8
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/corelib/thread/qthread_p.h')
-rw-r--r-- | src/corelib/thread/qthread_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 22a0669032..64e3f33191 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -222,6 +222,7 @@ public: mutable QMutex mutex; QThreadData *data; + bool running = false; static void setCurrentThread(QThread*) {} static QThread *threadForId(int) { return QThread::currentThread(); } |