From d115aa90a2e2c04b4a853fa3c064c4dc5d3e73bf Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Mon, 6 Mar 2023 12:06:53 +0100
Subject: Windows: initialize COM in internal thread
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The QWindowsDialogThread uses COM APIs, so we need to initialize COM.

Task-number: QTBUG-111625
Pick-to: 6.5 6.2
Change-Id: Ief136ee70671034cb8996ab2f5b113e3884d2953
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/plugins/platforms/windows/qwindowsdialoghelpers.cpp')

diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
index a8dbd8633e..51bd9f0c38 100644
--- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
+++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
@@ -31,6 +31,7 @@
 #include <QtCore/qmutex.h>
 #include <QtCore/quuid.h>
 #include <QtCore/qtemporaryfile.h>
+#include <QtCore/private/qfunctions_win_p.h>
 #include <QtCore/private/qsystemerror_p.h>
 
 #include <algorithm>
@@ -257,6 +258,7 @@ private:
 void QWindowsDialogThread::run()
 {
     qCDebug(lcQpaDialogs) << '>' << __FUNCTION__;
+    QComHelper comInit(COINIT_APARTMENTTHREADED);
     m_dialog->exec(m_owner);
     qCDebug(lcQpaDialogs) << '<' << __FUNCTION__;
 }
-- 
cgit v1.2.3