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

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Change-Id: Ib288796892faf5345d2a150a5ce0dadf91552924
This commit is contained in:
Eike Ziller
2018-06-04 16:33:03 +02:00
parent 07079a1613 2fb270c77f
commit c585e7091b
193 changed files with 2196 additions and 1542 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)
: QWidget(parent)
, m_model(QbsProjectManagerSettings::qbsSettingsBaseDir())
, m_model(QbsProjectManagerSettings::qbsSettingsBaseDir(), qbs::Settings::UserScope)
{
m_model.setEditable(false);
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)
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();
}