diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:01:59 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-19 03:01:59 +0200 |
| commit | bbed7673007688d0b7450f25565e2a61a77e1fa0 (patch) | |
| tree | 56718bf389f63713b060894af85fbf22d5140491 /src | |
| parent | 19445bb152eec07536ca6186aca78ac8eafe77e1 (diff) | |
| parent | d2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If093dd2bc8e66b0ec219a3d060f227572ee8ee09
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/wasapi/qwasapiutils.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/wasapi/qwasapiutils.cpp b/src/plugins/wasapi/qwasapiutils.cpp index 0d03982de..497e5fa6e 100644 --- a/src/plugins/wasapi/qwasapiutils.cpp +++ b/src/plugins/wasapi/qwasapiutils.cpp @@ -94,9 +94,7 @@ struct CoInitializer { CoInitializer() { - const bool isGuiThread = QCoreApplication::instance() && - QThread::currentThread() == QCoreApplication::instance()->thread(); - CoInitializeEx(NULL, isGuiThread ? COINIT_APARTMENTTHREADED : COINIT_MULTITHREADED); + CoInitializeEx(NULL, COINIT_MULTITHREADED); } ~CoInitializer() |