From 18277e7ea1b59c9887bf8ef6fee2437fa10c8401 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 9 Feb 2018 11:08:31 +0100 Subject: [PATCH] QbsProjectManager: Fix QML debugging support The module property override needs a "modules." prefix these days. Task-number: QTCREATORBUG-19655 Change-Id: I4d6025c479a65cf94968338884f80b0ffa5ac141 Reviewed-by: Christian Stenger --- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 6 ++++-- src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index fe8db1b9e2c..25772201ae9 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -634,8 +634,10 @@ void QbsBuildStepConfigWidget::updateState() command += ' ' + m_propertyCache.at(i).name + ':' + m_propertyCache.at(i).effectiveValue; } - if (m_step->isQmlDebuggingEnabled()) - command += " Qt.declarative.qmlDebugging:true Qt.quick.qmlDebugging:true"; + if (m_step->isQmlDebuggingEnabled()) { + command.append(' ').append(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY).append(":true ") + .append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true"); + } m_ui->commandLineTextEdit->setPlainText(command); QString summary = tr("Qbs: %1").arg(command); diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h index c0d8c2d9d30..8fe5f9170e1 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h @@ -67,8 +67,8 @@ const char QBS_VARIANT_RELEASE[] = "release"; const char QBS_CONFIG_VARIANT_KEY[] = "qbs.defaultBuildVariant"; const char QBS_CONFIG_PROFILE_KEY[] = "qbs.profile"; const char QBS_INSTALL_ROOT_KEY[] = "qbs.installRoot"; -const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "Qt.declarative.qmlDebugging"; -const char QBS_CONFIG_QUICK_DEBUG_KEY[] = "Qt.quick.qmlDebugging"; +const char QBS_CONFIG_DECLARATIVE_DEBUG_KEY[] = "modules.Qt.declarative.qmlDebugging"; +const char QBS_CONFIG_QUICK_DEBUG_KEY[] = "modules.Qt.quick.qmlDebugging"; const char QBS_FORCE_PROBES_KEY[] = "qbspm.forceProbes"; // Icons: