diff options
author | Yuhang Zhao <2546789017@qq.com> | 2022-12-23 13:38:22 +0800 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2023-01-23 16:39:16 +0100 |
commit | 21baa7623025308a39577e7582c023b1d3ae11d6 (patch) | |
tree | f6ae88335efd40f9f5b396a891190e617eb54b64 | |
parent | 86398b477bd38d35a411b4439f9da59c10f30eef (diff) |
windeployqt: a little readability improvement
Break the long sentence to improve the logic readability a bit.
Pick-to: 6.5
Change-Id: I3d0227e616a3c47e14ae7b5cfe4b47a39d778e5e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r-- | src/tools/windeployqt/utils.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/windeployqt/utils.cpp b/src/tools/windeployqt/utils.cpp index 7f4763a850..432d13d5da 100644 --- a/src/tools/windeployqt/utils.cpp +++ b/src/tools/windeployqt/utils.cpp @@ -737,7 +737,11 @@ inline void determineDebugAndDependentLibs(const ImageNtHeader *nth, const void } else { // When an MSVC debug entry is present, check whether the debug runtime // is actually used to detect -release / -force-debug-info builds. - *isDebugIn = hasDebugEntry && checkMsvcDebugRuntime(dependentLibraries) != MsvcReleaseRuntime; + const MsvcDebugRuntimeResult msvcrt = checkMsvcDebugRuntime(dependentLibraries); + if (msvcrt == NoMsvcRuntime) + *isDebugIn = hasDebugEntry; + else + *isDebugIn = hasDebugEntry && msvcrt == MsvcDebugRuntime; } } } |