aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/api
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2016-12-23 21:06:24 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2017-01-05 09:12:13 +0000
commit88f6c8aefc377b3b0b121bf27c6b33760ca157a8 (patch)
tree71404ce0c12ca086ffaf96e4df36dd032a03e256 /src/lib/corelib/api
parent36e736977e93fcc5d4165cd25b64e9ff20c820ac (diff)
Use a sorted vector rather than QSet or std::set
========== Performance data for Resolving ========== Old instruction count: 2324724447 New instruction count: 2317712921 Relative change: -1 % Old peak memory usage: 21411584 Bytes New peak memory usage: 21070552 Bytes Relative change: -2 % ========== Performance data for Rule Execution ========== Old instruction count: 4231322611 New instruction count: 4246208129 Relative change: +0 % Old peak memory usage: 19239000 Bytes New peak memory usage: 18181072 Bytes Relative change: -6 % ========== Performance data for Null Build ========== Old instruction count: 542161499 New instruction count: 505511534 Relative change: -7 % Old peak memory usage: 13599040 Bytes New peak memory usage: 11892952 Bytes Relative change: -13 % Change-Id: I36b3dbd3fd2a4bc7503ee7779d31bd0217000785 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/api')
-rw-r--r--src/lib/corelib/api/project.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index b2164c28b..cabe6cb21 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -796,7 +796,7 @@ void ProjectPrivate::retrieveProjectData(ProjectData &projectData,
ta.d->fileTags = it.value().fileTags.toStringList();
ta.d->properties.d->m_map = it.value().properties;
ta.d->isGenerated = true;
- ta.d->isTargetArtifact = resolvedProduct->fileTags.matches(it.value().fileTags);
+ ta.d->isTargetArtifact = resolvedProduct->fileTags.intersects(it.value().fileTags);
ta.d->isValid = true;
setupInstallData(ta, resolvedProduct);
product.d->generatedArtifacts << ta;
@@ -1084,7 +1084,7 @@ QHash<QString, QString> Project::usedEnvironment() const
QSet<QString> Project::buildSystemFiles() const
{
QBS_ASSERT(isValid(), return QSet<QString>());
- return d->internalProject->buildSystemFiles;
+ return d->internalProject->buildSystemFiles.toQSet();
}
RuleCommandList Project::ruleCommands(const ProductData &product,