feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QbsProjectManager: Fix QML debugging support

Browse Source 
The module property override needs a "modules." prefix these days.

Task-number: QTCREATORBUG-19655
Change-Id: I4d6025c479a65cf94968338884f80b0ffa5ac141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2018-02-09 11:08:31 +01:00
parent e463873d62
commit 18277e7ea1
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qbsprojectmanager/qbsbuildstep.cpp
View File

@@ -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("<b>Qbs:</b> %1").arg(command);

4
src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h
View File

@@ -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: