From 0174c966f734ba48d387257a14447e8b56d85d37 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 4 Apr 2012 18:27:24 +0200 Subject: qmake vcxproj generator: properly escape XML attributes Task-number: QTBUG-24954 Change-Id: I21299440ba3f268c2fa1e14d37003cdc3e6a35ad Reviewed-by: Oswald Buddenhagen --- qmake/generators/xmloutput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') 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("").arg(o.xo_text)); break; case tValueTag: -- cgit v1.2.3 From 99a207436924aa1339f48ababa1490675c6a00d3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 10 Apr 2012 18:46:06 +0200 Subject: 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 --- qmake/generators/win32/msvc_vcproj.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'qmake') 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 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); -- cgit v1.2.3