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 /tools | |
| parent | 0f813d7f28bacdd71ba2540946a801cf44e40a73 (diff) | |
| parent | b09610e10592af6224b64507f1d6d209d4baf6c9 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I59bbda884eb38d563b29a50f9a205922ce80066c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dumpcpp/main.cpp | 4 | ||||
| -rw-r--r-- | tools/dumpdoc/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 60a1d56..2baad0e 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1519,8 +1519,8 @@ static void parseOptions(Options *options) int main(int argc, char **argv) { - if (FAILED(CoInitialize(0))) { - qErrnoWarning("CoInitialize() failed."); + if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) { + qErrnoWarning("CoInitializeEx() failed."); return -1; } QCoreApplication app(argc, argv); diff --git a/tools/dumpdoc/main.cpp b/tools/dumpdoc/main.cpp index 7a87d8f..3f3dbd7 100644 --- a/tools/dumpdoc/main.cpp +++ b/tools/dumpdoc/main.cpp @@ -35,8 +35,8 @@ QT_USE_NAMESPACE int main(int argc, char **argv) { - if (FAILED(CoInitialize(0))) { - qErrnoWarning("CoInitialize() failed."); + if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) { + qErrnoWarning("CoInitializeEx() failed."); return -1; } |