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

Update qbs submodule

Browse Source 
To HEAD of 1.12 branch.

Change-Id: If93ae9f977882a1f0663c93e2aff21511322395f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Christian Kandeler
2018-06-01 13:08:48 +02:00
parent 6c9343c2bb
commit fd710f15c9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -100,7 +100,7 @@ void QbsProfilesSettingsPage::finish()
QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent)
: QWidget(parent) : QWidget(parent)
, m_model(QbsProjectManagerSettings::qbsSettingsBaseDir()) , m_model(QbsProjectManagerSettings::qbsSettingsBaseDir(), qbs::Settings::UserScope)
{ {
m_model.setEditable(false); m_model.setEditable(false);
m_ui.setupUi(this); m_ui.setupUi(this);

5
src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
View File

@@ -118,7 +118,8 @@ QString QbsManager::profileForKit(const ProjectExplorer::Kit *k)
if (!k) if (!k)
return QString(); return QString();
m_instance->updateProfileIfNecessary(k); 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) void QbsManager::setProfileForKit(const QString &name, const ProjectExplorer::Kit *k)
@@ -236,7 +237,7 @@ void QbsManager::handleKitRemoval(ProjectExplorer::Kit *kit)
{ {
m_kitsToBeSetupForQbs.removeOne(kit); m_kitsToBeSetupForQbs.removeOne(kit);
const QString key = qtcProfilePrefix() + kit->id().toString(); 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); settings()->remove(key);
qbs::Profile(profileName, settings()).removeProfile(); qbs::Profile(profileName, settings()).removeProfile();
} }

2
src/shared/qbs

Submodule src/shared/qbs updated: 49aec667b6...40746dae36