diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-11-12 12:16:03 (GMT) |
|---|---|---|
| committer | Ville Pernu <ville.pernu@nokia.com> | 2010-11-12 13:51:20 (GMT) |
| commit | 8593133729ca2a92cd5dcc87c5e56031708949bf (patch) | |
| tree | 6d31935a9c7606c51c7d97c028bdbe3909e07330 | |
| parent | 41cc62e076c9fc01d9cd2c66325a785d1643f6b6 (diff) | |
| download | Qt-8593133729ca2a92cd5dcc87c5e56031708949bf.zip Qt-8593133729ca2a92cd5dcc87c5e56031708949bf.tar.gz Qt-8593133729ca2a92cd5dcc87c5e56031708949bf.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
| -rw-r--r-- | qmake/generators/win32/msbuild_objectmodel.cpp | 2 |
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(' '); |