summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2010-11-12 12:16:03 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2010-11-12 12:59:16 (GMT)
commit4ba3dadcae97bfde6216c32cfa339f8f0e0253c7 (patch)
treee88fb64e4dbc05cd2ba96770f5e7b4058718f228 /qmake/generators
parent1af842ec8bcf2e86453f964464fb3770a6025146 (diff)
downloadQt-4ba3dadcae97bfde6216c32cfa339f8f0e0253c7.zip
Qt-4ba3dadcae97bfde6216c32cfa339f8f0e0253c7.tar.gz
Qt-4ba3dadcae97bfde6216c32cfa339f8f0e0253c7.tar.bz2
qmake vcxproj generator: fix description of custom build tools
The description of custom build tools that handle more than one extra compiler cannot be separated by ampersands in Visual Studio 2010. This seems to be a msbuild bug. We'll just circumvent this issue by changing the separator in the description to comma. Task-number: QTBUG-13986 Reviewed-by: ossi
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/win32/msbuild_objectmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index c963f46..c3436b4 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -2507,7 +2507,7 @@ bool VCXFilter::addExtraCompiler(const VCXFilterFile &info)
// Output in info.additionalFile -----------
if (!CustomBuildTool.Description.isEmpty())
- CustomBuildTool.Description += " & ";
+ CustomBuildTool.Description += ", ";
CustomBuildTool.Description += cmd_name;
CustomBuildTool.CommandLine += VCToolBase::fixCommandLine(cmd.trimmed());
int space = cmd.indexOf(' ');