From edba18247d7e3713ee8051469874ad323c090ff3 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 18 Dec 2019 10:07:57 +0100 Subject: windeployqt: Fix debug detection of "_app" versions of MSVC runtime UWP targets have the naming scheme of VCRUNTIMEXXX(d)_APP.dll. The "_APP" part, which is also mentioned in the comment, has to be taken into account when looking for the d "suffix" of the runtime library. Change-Id: Iea84687c7c3f230ac9520ca983e742b0938eec15 Reviewed-by: Friedemann Kleint Reviewed-by: Jiong Chang --- src/shared/winutils/utils.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp index f32b9b76b..f3bea29ab 100644 --- a/src/shared/winutils/utils.cpp +++ b/src/shared/winutils/utils.cpp @@ -800,6 +800,9 @@ static inline MsvcDebugRuntimeResult checkMsvcDebugRuntime(const QStringList &de pos = -1 == lastDotPos ? 0 : lastDotPos - 1; } + if (lib.contains(QLatin1String("_app"), Qt::CaseInsensitive)) + pos -= 4; + if (pos) { return lib.at(pos).toLower() == QLatin1Char('d') ? MsvcDebugRuntime : MsvcReleaseRuntime; -- cgit v1.2.3