diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-25 10:15:16 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-29 15:39:34 +0200 |
commit | 1bc7e9e77b2d6b03b995f376b622d4c8c97dd51c (patch) | |
tree | 23aabcab8feb2489a144d5229a6c8ee40b05bd56 /src/tools | |
parent | 49f9cadb52b5ef29e527b60c3881cb15a69c1625 (diff) |
Add QComHelper class for dealing with COM on Windows
Unifies our approach to calling CoInitializeEx and CoUninitialize,
removing a lot of boilerplate in the process, and also fixes a few
bugs where we would incorrectly balance our calls to CoInitializeEx
and CoUninitialize.
The optimistic approach of qfilesystemengine_win.cpp of calling
CoCreateInstance without initializing the COM library explicitly
has been removed, as calling CoInitializeEx should be a noop in
the situation where it's already been loaded.
Change-Id: I9e2ec101678c2ebb9946504b5e8034e58f1bb56a
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index c86a4bf896..8964e27fda 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -136,6 +136,7 @@ qt_internal_extend_target(Bootstrap CONDITION WIN32 ../../corelib/kernel/qcoreapplication_win.cpp ../../corelib/kernel/qwinregistry.cpp ../../corelib/plugin/qsystemlibrary.cpp + ../../corelib/kernel/qfunctions_win.cpp PUBLIC_LIBRARIES advapi32 netapi32 |