1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1616402489

Browse Source
This commit is contained in:
Qt CI Bot 2021-03-22 11:14:01 +00:00
commit fc76a348e4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/kernel/qfunctions_winrt_p.h
View File

@ -118,7 +118,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai
while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) { while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) {
QCoreApplication::processEvents(); QCoreApplication::processEvents();
if (timeout && t.hasExpired(timeout)) if (timeout && t.hasExpired(timeout))
return ERROR_TIMEOUT; return HRESULT_FROM_WIN32(ERROR_TIMEOUT);
} }
break; break;
case ProcessThreadEvents: case ProcessThreadEvents:
@ -126,7 +126,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai
while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) { while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) {
dispatcher->processEvents(QEventLoop::AllEvents); dispatcher->processEvents(QEventLoop::AllEvents);
if (timeout && t.hasExpired(timeout)) if (timeout && t.hasExpired(timeout))
return ERROR_TIMEOUT; return HRESULT_FROM_WIN32(ERROR_TIMEOUT);
} }
break; break;
} }
@ -136,7 +136,7 @@ static inline HRESULT _await_impl(const Microsoft::WRL::ComPtr<T> &asyncOp, Awai
while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) { while (SUCCEEDED(hr = asyncInfo->get_Status(&status)) && status == AsyncStatus::Started) {
QThread::yieldCurrentThread(); QThread::yieldCurrentThread();
if (timeout && t.hasExpired(timeout)) if (timeout && t.hasExpired(timeout))
return ERROR_TIMEOUT; return HRESULT_FROM_WIN32(ERROR_TIMEOUT);
} }
break; break;
} }