diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-11-08 21:16:55 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-11-13 19:34:07 +0100 |
| commit | f2cf5f5417d4df68eb0677e375cb81e39286c05f (patch) | |
| tree | ce75f050fbd02cfd106471ddcf046e8e22b818fc /src/network/access/qnetworkaccessmanager.cpp | |
| parent | f2cc6fd4a0734e442f1101e3277215ea9d44d0d2 (diff) | |
Port QThread::wait() to QDeadlineTimer
So we are in sync with QWaitCondition::wait().
Task-number: QTBUG-64266
Change-Id: I1d7487786513241cedd35d202c4ddee4937b08ec
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 3e1e6d8be8..6c1cb420fe 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -1981,7 +1981,7 @@ void QNetworkAccessManagerPrivate::destroyThread() { if (thread) { thread->quit(); - thread->wait(5000); + thread->wait(QDeadlineTimer(5000)); if (thread->isFinished()) delete thread; else |