diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2019-12-18 10:07:57 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-12-19 08:14:45 +0100 |
| commit | edba18247d7e3713ee8051469874ad323c090ff3 (patch) | |
| tree | 1704380b2eb04beef2aefb2dfa94aa84b8406123 | |
| parent | c2566a8c56f19b0c704a99b9d22997747e21f82a (diff) | |
| download | qttools-edba18247d7e3713ee8051469874ad323c090ff3.tar.gz | |
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 <Friedemann.Kleint@qt.io>
Reviewed-by: Jiong Chang <xspeed1989@gmail.com>
| -rw-r--r-- | src/shared/winutils/utils.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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; |