diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-14 03:00:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-14 03:00:48 +0200 |
| commit | e75a541dbb27119c31ffd6dd36c38cd8a81f2431 (patch) | |
| tree | 6e1ba5c3318904159b7507b1556f5044d5df019b /src | |
| parent | 0f813d7f28bacdd71ba2540946a801cf44e40a73 (diff) | |
| parent | b09610e10592af6224b64507f1d6d209d4baf6c9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I59bbda884eb38d563b29a50f9a205922ce80066c
Diffstat (limited to 'src')
| -rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp index 7e7bb3e..5ad97d8 100644 --- a/src/activeqt/control/qaxservermain.cpp +++ b/src/activeqt/control/qaxservermain.cpp @@ -287,7 +287,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, } if (run) { - if (SUCCEEDED(CoInitialize(0))) { + if (SUCCEEDED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) { #ifdef Q_CC_MINGW // define GlobalOptions class ID locally for MinGW, since it's missing from the distribution static const CLSID CLSID_GlobalOptions = @@ -314,7 +314,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, } CoUninitialize(); } else { - qErrnoWarning("CoInitialize() failed."); + qErrnoWarning("CoInitializeEx() failed."); nRet = -1; } } |