summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2023-03-06 12:06:53 +0100
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2023-03-10 21:37:55 +0100
commit04cac1965d1a740f3d34b639700e7a74eff71786 (patch)
tree3b20d7ece2fc273a0ff94ed1cb58770ee51db2d5
parent21e3afc80ae171fbe2abf56aeeb6ce69050608ce (diff)
Windows: initialize COM in internal thread
The QWindowsDialogThread uses COM APIs, so we need to initialize COM. Task-number: QTBUG-111625 Change-Id: Ief136ee70671034cb8996ab2f5b113e3884d2953 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit d115aa90a2e2c04b4a853fa3c064c4dc5d3e73bf) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index 203266f7b5..3a89303fd6 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -282,7 +282,9 @@ private:
void QWindowsDialogThread::run()
{
qCDebug(lcQpaDialogs) << '>' << __FUNCTION__;
+ CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
m_dialog->exec(m_owner);
+ CoUninitialize();
qCDebug(lcQpaDialogs) << '<' << __FUNCTION__;
}