From fd710f15c90e60202c8b7c56fddf47fbb5ca13d0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 1 Jun 2018 13:08:48 +0200 Subject: [PATCH] Update qbs submodule To HEAD of 1.12 branch. Change-Id: If93ae9f977882a1f0663c93e2aff21511322395f Reviewed-by: Joerg Bornemann --- src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp | 2 +- src/plugins/qbsprojectmanager/qbsprojectmanager.cpp | 5 +++-- src/shared/qbs | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index c2eb6b45d5e..4b7387039f8 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -100,7 +100,7 @@ void QbsProfilesSettingsPage::finish() QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) : QWidget(parent) - , m_model(QbsProjectManagerSettings::qbsSettingsBaseDir()) + , m_model(QbsProjectManagerSettings::qbsSettingsBaseDir(), qbs::Settings::UserScope) { m_model.setEditable(false); m_ui.setupUi(this); diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp index bb9bf44ce72..978ca571484 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp @@ -118,7 +118,8 @@ QString QbsManager::profileForKit(const ProjectExplorer::Kit *k) if (!k) return QString(); m_instance->updateProfileIfNecessary(k); - return settings()->value(qtcProfilePrefix() + k->id().toString()).toString(); + return settings()->value(qtcProfilePrefix() + k->id().toString(), qbs::Settings::UserScope) + .toString(); } void QbsManager::setProfileForKit(const QString &name, const ProjectExplorer::Kit *k) @@ -236,7 +237,7 @@ void QbsManager::handleKitRemoval(ProjectExplorer::Kit *kit) { m_kitsToBeSetupForQbs.removeOne(kit); const QString key = qtcProfilePrefix() + kit->id().toString(); - const QString profileName = settings()->value(key).toString(); + const QString profileName = settings()->value(key, qbs::Settings::UserScope).toString(); settings()->remove(key); qbs::Profile(profileName, settings()).removeProfile(); } diff --git a/src/shared/qbs b/src/shared/qbs index 49aec667b6f..40746dae364 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 49aec667b6f91b45a14b35cad42cb3b2dbcfbe33 +Subproject commit 40746dae36452398649481fecad9cdc5f25cc80f