diff options
| author | Paweł Wegner <pawel.wegner95@gmail.com> | 2020-05-30 14:31:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-06-03 17:42:27 +0000 |
| commit | d96603fd7d3340fc925d05fd059c727b69b63636 (patch) | |
| tree | 4acd61f3b70685a508351266ea1ff309b54a1e8f | |
| parent | e1c5282d9f97bc2068107d4625933c7fefb9f0cc (diff) | |
Fix MSVC runtime detection for WinRT debug binaries
Prior to the fix if the app depends on any library with 'app' substring
in the name the build will always be detected as release. For example
WinRT apps which depend on vccorlib_app library will always be detected as release.
Change-Id: Ib17376962f3d5120211338b4baa08a431a226dd7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 096dfcf4f0d153546ca2bad4191b471c97731970)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/shared/winutils/utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp index b62f69a1e..e34766b5b 100644 --- a/src/shared/winutils/utils.cpp +++ b/src/shared/winutils/utils.cpp @@ -801,7 +801,7 @@ static inline MsvcDebugRuntimeResult checkMsvcDebugRuntime(const QStringList &de pos = -1 == lastDotPos ? 0 : lastDotPos - 1; } - if (lib.contains(QLatin1String("_app"), Qt::CaseInsensitive)) + if (pos > 0 && lib.contains(QLatin1String("_app"), Qt::CaseInsensitive)) pos -= 4; if (pos) { |