From 46b397d67f4f5e623364d73648478de623381b01 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 6 Jan 2014 10:04:23 +0100 Subject: [PATCH] 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 --- qmake/generators/win32/msvc_vcproj.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index fbc2f6b0a6..f86c8512d4 100644 --- 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; + } } }