diff options
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/xmloutput.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 2f19ea4495..c2482b58a8 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); diff --git a/qmake/generators/xmloutput.cpp b/qmake/generators/xmloutput.cpp index f7fa547a75..c868021f2b 100644 --- a/qmake/generators/xmloutput.cpp +++ b/qmake/generators/xmloutput.cpp @@ -179,7 +179,7 @@ XmlOutput& XmlOutput::operator<<(const xml_output& o) break; case tTagValue: addRaw(QString("\n%1<%2>").arg(currentIndent).arg(o.xo_text)); - addRaw(QString("%1").arg(o.xo_value)); + addRaw(doConversion(o.xo_value)); addRaw(QString("</%1>").arg(o.xo_text)); break; case tValueTag: |