From f93a55ac5c41cb0407a3ece1602a83ca23065b74 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 6 Oct 2017 16:49:47 +0200 Subject: [PATCH] QbsProjectManager: Fix build setting getting lost If the user set some qbs property and also unchecked the "Use default installation" box, the latter setting got lost on re-loading the build step configuration. Task-number: QTCREATORBUG-18895 Change-Id: I868312fbbd8e5ca9ad9f34b88866fe7b72884a9a Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index 063e6bf203b..a212ae8567f 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -780,6 +780,9 @@ void QbsBuildStepConfigWidget::applyCachedProperties() if (tmp.contains(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)) data.insert(Constants::QBS_CONFIG_QUICK_DEBUG_KEY, tmp.value(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)); + if (tmp.contains(Constants::QBS_INSTALL_ROOT_KEY)) + data.insert(Constants::QBS_INSTALL_ROOT_KEY, + tmp.value(Constants::QBS_INSTALL_ROOT_KEY)); for (int i = 0; i < m_propertyCache.count(); ++i) { const Property &property = m_propertyCache.at(i);