fix detection for multiple VS installations

In the case of multiple VS installations, a static variable wasn't initialized. That led to wrong values in subsequent calls of the detection function. [ChangeLog][qtbase][qmake] fix detection for multiple VS installations Task-number: QTBUG-35530 Change-Id: I3fc23bc99679fff640f39578a7074d16fe923334 Reviewed-by: Andy Shaw <[email protected]>
CryFeiFei · Jan 8, 2014 · 46b397d · 46b397d
1 parent 2b3f293
commit 46b397d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
@@ -149,8 +149,10 @@ DotNET which_dotnet_version()
             const QString productPath = installPaths.value(dotNetCombo[i].version);
             if (productPath.isEmpty())
                 continue;
-            if (path.startsWith(productPath, Qt::CaseInsensitive))
-                return dotNetCombo[i].version;
+            if (path.startsWith(productPath, Qt::CaseInsensitive)) {
+                current_version = dotNetCombo[i].version;
+                return current_version;
+            }
         }
     }