forked from qt-creator/qt-creator
Update qbs submodule
To HEAD of 1.12 branch. Change-Id: If93ae9f977882a1f0663c93e2aff21511322395f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Submodule src/shared/qbs updated: 49aec667b6...40746dae36
Reference in New Issue
Block a user