diff options
author | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-03-06 12:31:50 +0100 |
commit | 2add2dbdaa9ff6ca6637ca22d6a9b7c7027751be (patch) | |
tree | 585628b0ceacfbdef5b9661c4043b9f71dfe9b01 /src/corelib/thread | |
parent | f792fed2ff519ffac1436e41e47cc0504d253a77 (diff) | |
parent | 4eda22ea0db1fc571ae9f44a68825056e6245548 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/network/access/http2/hpacktable_p.h
Change-Id: Ie0c296667dfdebba84f4858056a1ac80c24ee7df
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qthread.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 05bc064005..b023ae9ed2 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -818,6 +818,16 @@ void QThread::quit() } +void QThread::exit(int returnCode) +{ + Q_D(QThread); + d->data->quitNow = true; + for (int i = 0; i < d->data->eventLoops.size(); ++i) { + QEventLoop *eventLoop = d->data->eventLoops.at(i); + eventLoop->exit(returnCode); + } +} + bool QThread::wait(unsigned long time) { Q_UNUSED(time); |