diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-04-10 16:46:06 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-16 12:18:58 (GMT) |
| commit | e786478d64f6ace802e103a54783784572048864 (patch) | |
| tree | 7b01f5c4de14583a8a8125f07f14c7a57ee120b9 /qmake | |
| parent | e394e16ace6838768180f53ad6f32ecd4ac188fb (diff) | |
| download | Qt-e786478d64f6ace802e103a54783784572048864.zip Qt-e786478d64f6ace802e103a54783784572048864.tar.gz Qt-e786478d64f6ace802e103a54783784572048864.tar.bz2 | |
qmake vc(x)project generator: fix VC++ Express detection
If VC++ 2010 Express and VC# 2010 Express are installed, then the
installation path is written in two places into the registry.
We're now filtering detected installations with the same installation
path.
Task-number: QTBUG-24956
Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 99a207436924aa1339f48ababa1490675c6a00d3)
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 676dee3..6bd4c70 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -115,11 +115,13 @@ DotNET which_dotnet_version() current_version = NET2002; QStringList warnPath; + QHash<DotNET, QString> installPaths; int installed = 0; int i = 0; for(; dotNetCombo[i].version; ++i) { QString path = qt_readRegistryKey(HKEY_LOCAL_MACHINE, dotNetCombo[i].regKey); - if(!path.isEmpty()) { + if (!path.isEmpty() && installPaths.value(dotNetCombo[i].version) != path) { + installPaths.insert(dotNetCombo[i].version, path); ++installed; current_version = dotNetCombo[i].version; warnPath += QString("%1").arg(dotNetCombo[i].versionStr); |