aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/generators/generator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/corelib/generators/generator.cpp')
-rw-r--r--src/lib/corelib/generators/generator.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/corelib/generators/generator.cpp b/src/lib/corelib/generators/generator.cpp
index d3cdce412..8fdd3555e 100644
--- a/src/lib/corelib/generators/generator.cpp
+++ b/src/lib/corelib/generators/generator.cpp
@@ -82,14 +82,11 @@ ErrorInfo ProjectGenerator::generate(const QList<Project> &projects,
const QString &qbsSettingsDir,
const Internal::Logger &logger)
{
- d->projects = projects;
- std::sort(d->projects.begin(), d->projects.end(),
- [](const Project &a, const Project &b) {
- return _configurationName(a) < _configurationName(b); });
- d->buildConfigurations = buildConfigurations;
- std::sort(d->buildConfigurations.begin(), d->buildConfigurations.end(),
- [](const QVariantMap &a, const QVariantMap &b) {
- return _configurationName(a) < _configurationName(b); });
+ d->projects = Internal::sorted(projects, [](const Project &lhs, const Project &rhs) {
+ return _configurationName(lhs) < _configurationName(rhs); });
+ d->buildConfigurations = Internal::sorted(
+ buildConfigurations, [](const QVariantMap &lhs, const QVariantMap &rhs) {
+ return _configurationName(lhs) < _configurationName(rhs); });
d->installOptions = installOptions;
d->qbsSettingsDir = qbsSettingsDir;
d->logger = logger;
@@ -210,7 +207,7 @@ const GeneratableProject ProjectGenerator::project() const
{
QMap<QString, ProjectData> rootProjects;
GeneratableProject proj;
- for (const auto &project : qAsConst(d->projects)) {
+ for (const auto &project : std::as_const(d->projects)) {
const QString configurationName = _configurationName(project);
rootProjects.insert(configurationName, project.projectData());
proj.projects.insert(configurationName, project);