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

QbsProjectManager: Simplify profile creation code a bit

Browse Source 
Change-Id: I253671358955a970def0eb1343558135a38acaa2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2021-06-24 12:13:26 +02:00
parent b52337aef9
commit bd9bcdb925
2 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/qbsprojectmanager/qbsprofilemanager.cpp
View File

@@ -154,11 +154,6 @@ QString QbsProfileManager::ensureProfileForKit(const ProjectExplorer::Kit *k)
return profileNameForKit(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) void QbsProfileManager::updateProfileIfNecessary(const ProjectExplorer::Kit *kit)
{ {
// kit in list <=> profile update is necessary // kit in list <=> profile update is necessary
@@ -173,29 +168,11 @@ void QbsProfileManager::updateAllProfiles()
addProfileFromKit(kit); 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) void QbsProfileManager::addProfileFromKit(const ProjectExplorer::Kit *k)
{ {
const QString name = profileNameForKit(k); const QString name = profileNameForKit(k);
runQbsConfig(QbsConfigOp::Unset, "profiles." + name); runQbsConfig(QbsConfigOp::Unset, "profiles." + name);
setProfileForKit(name, k); runQbsConfig(QbsConfigOp::Set, kitNameKeyInQbsSettings(k), name);
addQtProfileFromKit(name, k);
// set up properties: // set up properties:
QVariantMap data = m_defaultPropertyProvider->properties(k, QVariantMap()); QVariantMap data = m_defaultPropertyProvider->properties(k, QVariantMap());
@@ -203,8 +180,13 @@ void QbsProfileManager::addProfileFromKit(const ProjectExplorer::Kit *k)
if (provider->canHandle(k)) if (provider->canHandle(k))
data = provider->properties(k, data); 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) void QbsProfileManager::handleKitUpdate(ProjectExplorer::Kit *kit)

3
src/plugins/qbsprojectmanager/qbsprofilemanager.h
View File

@@ -58,9 +58,6 @@ signals:
void qbsProfilesUpdated(); void qbsProfilesUpdated();
private: 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 addProfileFromKit(const ProjectExplorer::Kit *k);
void updateAllProfiles(); void updateAllProfiles();