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

QbsProjectManager: Do not map QML debugging setting to Qt.declarative

Browse Source 
QtQuick1 is no longer supported by Qt Creator.

Change-Id: I684ac12bca29779a18cc870e94071412edd29985
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2018-02-09 13:33:40 +01:00
parent 60a3fd59d4
commit d595896ea4
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -633,10 +633,8 @@ void QbsBuildStepConfigWidget::updateState()
command += ' ' + m_propertyCache.at(i).name + ':' + m_propertyCache.at(i).effectiveValue; command += ' ' + m_propertyCache.at(i).name + ':' + m_propertyCache.at(i).effectiveValue;
} }
if (m_step->isQmlDebuggingEnabled()) { if (m_step->isQmlDebuggingEnabled())
command.append(' ').append(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY).append(":true ") command.append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true");
.append(Constants::QBS_CONFIG_QUICK_DEBUG_KEY).append(":true");
}
m_ui->commandLineTextEdit->setPlainText(command); m_ui->commandLineTextEdit->setPlainText(command);
QString summary = tr("<b>Qbs:</b> %1").arg(command); QString summary = tr("<b>Qbs:</b> %1").arg(command);
@@ -668,7 +666,7 @@ void QbsBuildStepConfigWidget::updatePropertyEdit(const QVariantMap &data)
// remove data that is edited with special UIs: // remove data that is edited with special UIs:
editable.remove(Constants::QBS_CONFIG_PROFILE_KEY); editable.remove(Constants::QBS_CONFIG_PROFILE_KEY);
editable.remove(Constants::QBS_CONFIG_VARIANT_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_CONFIG_QUICK_DEBUG_KEY);
editable.remove(Constants::QBS_FORCE_PROBES_KEY); editable.remove(Constants::QBS_FORCE_PROBES_KEY);
editable.remove(Constants::QBS_INSTALL_ROOT_KEY); editable.remove(Constants::QBS_INSTALL_ROOT_KEY);