aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/rulecommands.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/buildgraph/rulecommands.cpp')
-rw-r--r--src/lib/corelib/buildgraph/rulecommands.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index 88ab1ce06..8fa3255f1 100644
--- a/src/lib/corelib/buildgraph/rulecommands.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -70,6 +70,7 @@ static QString responseFileUsagePrefixProperty()
{
return QStringLiteral("responseFileUsagePrefix");
}
+static QString responseFileSeparatorProperty() { return QStringLiteral("responseFileSeparator"); }
static QString silentProperty() { return QStringLiteral("silent"); }
static QString stderrFilePathProperty() { return QStringLiteral("stderrFilePath"); }
static QString stderrFilterFunctionProperty() { return QStringLiteral("stderrFilterFunction"); }
@@ -216,6 +217,8 @@ static QScriptValue js_Command(QScriptContext *context, QScriptEngine *engine)
engine->toScriptValue(commandPrototype->responseFileArgumentIndex()));
cmd.setProperty(responseFileUsagePrefixProperty(),
engine->toScriptValue(commandPrototype->responseFileUsagePrefix()));
+ cmd.setProperty(responseFileSeparatorProperty(),
+ engine->toScriptValue(commandPrototype->responseFileSeparator()));
cmd.setProperty(stdoutFilePathProperty(),
engine->toScriptValue(commandPrototype->stdoutFilePath()));
cmd.setProperty(stderrFilePathProperty(),
@@ -239,6 +242,7 @@ ProcessCommand::ProcessCommand()
: m_maxExitCode(0)
, m_responseFileThreshold(defaultResponseFileThreshold())
, m_responseFileArgumentIndex(0)
+ , m_responseFileSeparator(QStringLiteral("\n"))
{
}
@@ -277,6 +281,7 @@ bool ProcessCommand::equals(const AbstractCommand *otherAbstractCommand) const
&& m_responseFileThreshold == other->m_responseFileThreshold
&& m_responseFileArgumentIndex == other->m_responseFileArgumentIndex
&& m_responseFileUsagePrefix == other->m_responseFileUsagePrefix
+ && m_responseFileSeparator == other->m_responseFileSeparator
&& m_stdoutFilePath == other->m_stdoutFilePath
&& m_stderrFilePath == other->m_stderrFilePath
&& m_relevantEnvVars == other->m_relevantEnvVars
@@ -311,6 +316,8 @@ void ProcessCommand::fillFromScriptValue(const QScriptValue *scriptValue, const
.toInt32();
m_responseFileUsagePrefix = scriptValue->property(responseFileUsagePrefixProperty())
.toString();
+ m_responseFileSeparator = scriptValue->property(responseFileSeparatorProperty())
+ .toString();
QStringList envList = scriptValue->property(environmentProperty()).toVariant()
.toStringList();
getEnvironmentFromList(envList);