From 102a058c2517621a758730bd47389f914d4a8c8a Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 9 Mar 2018 17:12:52 +0100 Subject: [PATCH] QbsProjectManager: Fix "equivalent command line" contents - We forgot to adapt to the introduction of the "config" key. - The space character was missing before the QML debugging property. Task-number: QTCREATORBUG-20024 Change-Id: Ie4a94a04989caa14b1ddc11c8595d679d1871625 Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp | 2 +- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp index 94555e802c8..5f4c8341b6b 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp @@ -372,7 +372,7 @@ QString QbsBuildConfiguration::equivalentCommandLine(const BuildStep *buildStep) const QString profileName = QbsManager::instance()->profileForKit(buildStep->target()->kit()); const QString buildVariant = qbsConfiguration() .value(QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY)).toString(); - Utils::QtcProcess::addArg(&commandLine, configurationName()); + Utils::QtcProcess::addArg(&commandLine, QLatin1String("config:") + configurationName()); Utils::QtcProcess::addArg(&commandLine, QLatin1String(Constants::QBS_CONFIG_VARIANT_KEY) + QLatin1Char(':') + buildVariant); const Utils::FileName installRoot = stepProxy.installRoot(); diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 7b2e024f3e6..ffe80df75f4 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -634,7 +634,7 @@ void QbsBuildStepConfigWidget::updateState() } if (m_step->isQmlDebuggingEnabled()) - command.append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true"); + command.append(' ').append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true"); m_ui->commandLineTextEdit->setPlainText(command); QString summary = tr("Qbs: %1").arg(command);