diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-19 10:06:55 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-19 10:10:24 (GMT) |
| commit | 83525ca84ba7adadaeeb65ffa55a6d0f2630caaa (patch) | |
| tree | 83a26fc42ba3811baf38776d266d4bf600684715 /qmake/generators/win32/msvc_objectmodel.cpp | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
| parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
| download | Qt-83525ca84ba7adadaeeb65ffa55a6d0f2630caaa.zip Qt-83525ca84ba7adadaeeb65ffa55a6d0f2630caaa.tar.gz Qt-83525ca84ba7adadaeeb65ffa55a6d0f2630caaa.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/kernel/qgesturemanager.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Changes in qmake/generators/win32/msvc_objectmodel.cpp come
from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index b20d2b7..834e5fd 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -2288,7 +2288,7 @@ bool VCFilter::addExtraCompiler(const VCFilterFile &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(' '); |