Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I8d40bdf8bf8d96b0fb01aec7c0e7ffaeb4209004

1 files changed, 6 insertions, 7 deletions

diff --git a/src/shared/winutils/utils.cpp b/src/shared/winutils/utils.cpp
index 263efbe18..9818d53f9 100644
--- a/src/shared/winutils/utils.cpp
+++ b/src/shared/winutils/utils.cpp
@@ -794,14 +794,13 @@ static inline MsvcDebugRuntimeResult checkMsvcDebugRuntime(const QStringList &de
     for (const QString &lib : dependentLibraries) {
         int pos = 0;
         if (lib.startsWith(QLatin1String("MSVCR"), Qt::CaseInsensitive)
-            || lib.startsWith(QLatin1String("MSVCP"), Qt::CaseInsensitive)) {
-            pos = 5;
-        } else if (lib.startsWith(QLatin1String("VCRUNTIME"), Qt::CaseInsensitive)) {
-            pos = 9;
+            || lib.startsWith(QLatin1String("MSVCP"), Qt::CaseInsensitive)
+            || lib.startsWith(QLatin1String("VCRUNTIME"), Qt::CaseInsensitive)) {
+            int lastDotPos = lib.lastIndexOf(QLatin1Char('.'));
+            pos = -1 == lastDotPos ? 0 : lastDotPos - 1;
         }
-        if (pos && lib.at(pos).isDigit()) {
-            for (++pos; lib.at(pos).isDigit(); ++pos)
-                ;
+
+        if (pos) {
             return lib.at(pos).toLower() == QLatin1Char('d')
                 ? MsvcDebugRuntime : MsvcReleaseRuntime;
         }