diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp index e32d3abeda5..ef93c2a4b0b 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.cpp @@ -154,11 +154,6 @@ QString QbsProfileManager::ensureProfileForKit(const ProjectExplorer::Kit *k) return profileNameForKit(k); } -void QbsProfileManager::setProfileForKit(const QString &name, const ProjectExplorer::Kit *k) -{ - runQbsConfig(QbsConfigOp::Set, kitNameKeyInQbsSettings(k), name); -} - void QbsProfileManager::updateProfileIfNecessary(const ProjectExplorer::Kit *kit) { // kit in list <=> profile update is necessary @@ -173,29 +168,11 @@ void QbsProfileManager::updateAllProfiles() addProfileFromKit(kit); } -void QbsProfileManager::addProfile(const QString &name, const QVariantMap &data) -{ - const QString keyPrefix = "profiles." + name + "."; - for (auto it = data.begin(); it != data.end(); ++it) - runQbsConfig(QbsConfigOp::Set, keyPrefix + it.key(), it.value()); - emit qbsProfilesUpdated(); -} - -void QbsProfileManager::addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k) -{ - if (const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(k)) { - runQbsConfig(QbsConfigOp::Set, - "profiles." + profileName + ".moduleProviders.Qt.qmakeFilePaths", - qt->qmakeCommand().toString()); - } -} - void QbsProfileManager::addProfileFromKit(const ProjectExplorer::Kit *k) { const QString name = profileNameForKit(k); runQbsConfig(QbsConfigOp::Unset, "profiles." + name); - setProfileForKit(name, k); - addQtProfileFromKit(name, k); + runQbsConfig(QbsConfigOp::Set, kitNameKeyInQbsSettings(k), name); // set up properties: QVariantMap data = m_defaultPropertyProvider->properties(k, QVariantMap()); @@ -203,8 +180,13 @@ void QbsProfileManager::addProfileFromKit(const ProjectExplorer::Kit *k) if (provider->canHandle(k)) data = provider->properties(k, data); } + if (const QtSupport::BaseQtVersion * const qt = QtSupport::QtKitAspect::qtVersion(k)) + data.insert("moduleProviders.Qt.qmakeFilePaths", qt->qmakeCommand().toString()); - addProfile(name, data); + const QString keyPrefix = "profiles." + name + "."; + for (auto it = data.begin(); it != data.end(); ++it) + runQbsConfig(QbsConfigOp::Set, keyPrefix + it.key(), it.value()); + emit qbsProfilesUpdated(); } void QbsProfileManager::handleKitUpdate(ProjectExplorer::Kit *kit) diff --git a/src/plugins/qbsprojectmanager/qbsprofilemanager.h b/src/plugins/qbsprojectmanager/qbsprofilemanager.h index 73f52c3d9f8..9e4b9600dcc 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilemanager.h +++ b/src/plugins/qbsprojectmanager/qbsprofilemanager.h @@ -58,9 +58,6 @@ signals: void qbsProfilesUpdated(); private: - void setProfileForKit(const QString &name, const ProjectExplorer::Kit *k); - void addProfile(const QString &name, const QVariantMap &data); - void addQtProfileFromKit(const QString &profileName, const ProjectExplorer::Kit *k); void addProfileFromKit(const ProjectExplorer::Kit *k); void updateAllProfiles();