1 files changed, 6 insertions, 20 deletions

diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 8686ae8..cff7a14 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1027,37 +1027,23 @@ void VcprojGenerator::initPreBuildEventTools()
 {
 }
 
-QString VcprojGenerator::fixCommandLine(DotNET version, const QString &input) const
-{
-    QString result = input;
-
-    if (version >= NET2005)
-        result = result.replace(QLatin1Char('\n'), QLatin1String("
"));
-
-    return result;
-}
-
 void VcprojGenerator::initPostBuildEventTools()
 {
     VCConfiguration &conf = vcProject.Configuration;
     if(!project->values("QMAKE_POST_LINK").isEmpty()) {
-        QString cmdline = fixCommandLine(conf.CompilerVersion, var("QMAKE_POST_LINK"));
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));
         conf.postBuild.CommandLine = cmdline;
-        if (conf.CompilerVersion < NET2005)
-            cmdline = cmdline.replace("\n", "&&");
-        conf.postBuild.Description = cmdline;
+        conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));
     }
 
     QString signature = !project->isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");
     bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") &&
                         !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
     if(useSignature)
-        conf.postBuild.CommandLine.prepend(QLatin1String("signtool sign /F ") + signature + " \"$(TargetPath)\"\n" +
-            (!conf.postBuild.CommandLine.isEmpty() ? " && " : ""));
+        conf.postBuild.CommandLine.prepend(
+                QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));
 
     if(!project->values("MSVCPROJ_COPY_DLL").isEmpty()) {
-        if(!conf.postBuild.CommandLine.isEmpty())
-            conf.postBuild.CommandLine += " && ";
         conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
         conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
     }
@@ -1186,9 +1172,9 @@ void VcprojGenerator::initPreLinkEventTools()
 {
     VCConfiguration &conf = vcProject.Configuration;
     if(!project->values("QMAKE_PRE_LINK").isEmpty()) {
-        QString cmdline = fixCommandLine(conf.CompilerVersion, var("QMAKE_PRE_LINK"));
-        conf.preLink.Description = cmdline;
+        QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));
         conf.preLink.CommandLine = cmdline;
+        conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));
     }
 }