aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2018-03-21 12:11:25 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2018-03-22 08:14:48 +0000
commitcaa7d868fca080029dd77b44fafc830acf17a158 (patch)
tree962819bf336aa6c976d3937f67fd81bb5cc7bb81
parentf1d22e2a786ec5c8b46e0f7b8735697669fa5aaa (diff)
Adjust Visual Studio project generator to CLI changes
Configuration names must be prefixed by "config:". Task-number: QBS-1303 Change-Id: I63636141acdab7cc325378a1696e15842815d003 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
index d8389817f..0da732a42 100644
--- a/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
+++ b/src/plugins/generator/visualstudio/msbuildsharedsolutionpropertiesproject.cpp
@@ -44,8 +44,9 @@ static QString qbsCommandLine(const GeneratableProject &project,
const QString &qbsSettingsDir,
const Internal::VisualStudioVersionInfo &versionInfo)
{
- auto addEnvironmentVariableArgument = [&](Internal::CommandLine &cl, const QString &var) {
- cl.appendRawArgument(QStringLiteral("\"$(%1)\"").arg(var));
+ auto addEnvironmentVariableArgument = [](Internal::CommandLine &cl, const QString &var,
+ const QString &prefix = QString()) {
+ cl.appendRawArgument(QStringLiteral("\"%1$(%2)\"").arg(prefix, var));
};
auto realSubCommand = subCommand;
@@ -92,7 +93,8 @@ static QString qbsCommandLine(const GeneratableProject &project,
commandLine.appendArgument(QStringLiteral("--force-probe-execution"));
}
- addEnvironmentVariableArgument(commandLine, QStringLiteral("Configuration"));
+ addEnvironmentVariableArgument(commandLine, QStringLiteral("Configuration"),
+ QStringLiteral("config:"));
return commandLine.toCommandLine(Internal::HostOsInfo::HostOsWindows);
}