From d595896ea439fc77b4ca3bc7a92fd8a5debf8461 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 9 Feb 2018 13:33:40 +0100 Subject: [PATCH] QbsProjectManager: Do not map QML debugging setting to Qt.declarative QtQuick1 is no longer supported by Qt Creator. Change-Id: I684ac12bca29779a18cc870e94071412edd29985 Reviewed-by: Christian Stenger --- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 3ea9faeffee..7b2e024f3e6 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -633,10 +633,8 @@ void QbsBuildStepConfigWidget::updateState() command += ' ' + m_propertyCache.at(i).name + ':' + m_propertyCache.at(i).effectiveValue; } - if (m_step->isQmlDebuggingEnabled()) { - command.append(' ').append(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY).append(":true ") - .append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true"); - } + if (m_step->isQmlDebuggingEnabled()) + command.append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true"); m_ui->commandLineTextEdit->setPlainText(command); QString summary = tr("Qbs: %1").arg(command); @@ -668,7 +666,7 @@ void QbsBuildStepConfigWidget::updatePropertyEdit(const QVariantMap &data) // remove data that is edited with special UIs: editable.remove(Constants::QBS_CONFIG_PROFILE_KEY); editable.remove(Constants::QBS_CONFIG_VARIANT_KEY); - editable.remove(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY); + editable.remove(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY); // For existing .user files editable.remove(Constants::QBS_CONFIG_QUICK_DEBUG_KEY); editable.remove(Constants::QBS_FORCE_PROBES_KEY); editable.remove(Constants::QBS_INSTALL_ROOT_KEY);