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

QbsProjectManager: Get rid of redundant code

Browse Source 
Change-Id: I44c5058161312c832bf1e74c417007d02f2f4f7b
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Christian Kandeler
2017-10-06 17:06:59 +02:00
parent f93a55ac5c
commit 01f81fa4dc
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -774,15 +774,14 @@ void QbsBuildStepConfigWidget::applyCachedProperties()
tmp.value(Constants::QBS_CONFIG_PROFILE_KEY)); tmp.value(Constants::QBS_CONFIG_PROFILE_KEY));
data.insert(Constants::QBS_CONFIG_VARIANT_KEY, data.insert(Constants::QBS_CONFIG_VARIANT_KEY,
tmp.value(Constants::QBS_CONFIG_VARIANT_KEY)); tmp.value(Constants::QBS_CONFIG_VARIANT_KEY));
if (tmp.contains(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)) const QStringList additionalSpecialKeys({Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY,
data.insert(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY, Constants::QBS_CONFIG_QUICK_DEBUG_KEY,
tmp.value(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)); Constants::QBS_INSTALL_ROOT_KEY});
if (tmp.contains(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)) for (const QString &key : additionalSpecialKeys) {
data.insert(Constants::QBS_CONFIG_QUICK_DEBUG_KEY, const auto it = tmp.constFind(key);
tmp.value(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)); if (it != tmp.cend())
if (tmp.contains(Constants::QBS_INSTALL_ROOT_KEY)) data.insert(key, it.value());
data.insert(Constants::QBS_INSTALL_ROOT_KEY, }
tmp.value(Constants::QBS_INSTALL_ROOT_KEY));
for (int i = 0; i < m_propertyCache.count(); ++i) { for (int i = 0; i < m_propertyCache.count(); ++i) {
const Property &property = m_propertyCache.at(i); const Property &property = m_propertyCache.at(i);