summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-01-06 10:04:23 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-08 13:05:55 +0100
commit46b397d67f4f5e623364d73648478de623381b01 (patch)
treea89da4e89c387be55681a1182cea8d9a0c462d72 /qmake/generators
parent2b3f293d892c5268bd2a07ed17fa9fc5adacbd76 (diff)
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 <andy.shaw@digia.com>
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp6
1 files 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;
+ }
}
}