diff options
| author | Paweł Wegner <pawel.wegner95@gmail.com> | 2020-05-30 14:31:57 +0200 |
|---|---|---|
| committer | Paweł Wegner <pawel.wegner95@gmail.com> | 2020-06-03 19:02:19 +0200 |
| commit | 096dfcf4f0d153546ca2bad4191b471c97731970 (patch) | |
| tree | 7f5c85bfaafcf55a9d1f1adc59f22de109f836f1 /src/shared/winutils/utils.cpp | |
| parent | 88f4498759de2c3be53933e85ea405ee3554e8b8 (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
Pick-to: 5.15
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/shared/winutils/utils.cpp')
| -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 2b14fbe90..aaad905a0 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) { |