Strip echo suppression character "@" from commands in symbian-sbsv2

Symbian-sbsv2 toolchain cannot handle echo suppresion character "@"
in recipes, so the character is stripped from all commands if it exists
at the beginning of the command.

Task-number: QTBUG-4767
Reviewed-by: Iain

1 files changed, 6 insertions, 0 deletions

diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index f94a63f06f..6f532886a4 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -84,6 +84,12 @@ static void fixFlmCmd(QString *cmdLine, const QMap<QString, QString> &commandsTo
     // separator, so replace it with "&&" command concatenator.
     cmdLine->replace("\n\t", "&&");
 
+    // Strip output suppression, as sbsv2 can't handle it in FLMs. Cannot be done by simply
+    // adding "@" to commandsToReplace, as it'd get handled last due to alphabetical ordering,
+    // potentially masking other commands that need replacing.
+    if (cmdLine->contains("@"))
+        cmdLine->replace(QRegExp(cmdFind.arg("@")), cmdReplace.arg(""));
+
     // Iterate command replacements in reverse alphabetical order of keys so
     // that keys which are starts of other longer keys are iterated after longer keys.
     QMapIterator<QString, QString> cmdIter(commandsToReplace);