summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/tools/windeployqt/utils.cpp6
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;
}
}
}