diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-26 10:02:25 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-26 16:07:42 +0000 |
commit | f5e9326c51e6352eed919c66d0c2a213f1e5b1dc (patch) | |
tree | f439dc330f5f70adb25d84c9456d766b152bc172 /src/lib/corelib/language/projectresolver.cpp | |
parent | 619a0d76d2c1cbb86b8dd01f85768e97e5f81810 (diff) |
Make ResolvedProduct::artifactProperties a vector
The value_type is not suitable for QList.
Change-Id: I73d021f0c635ed46992397c4d6e3f3394ec5a7f8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
-rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 7341efdd4..c25e252bf 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -727,7 +727,7 @@ void ProjectResolver::resolveGroupFully(Item *item, ProjectResolver::ProjectCont } // Discard any Group with the same fileTagsFilter that was defined in a base file. - m_productContext->product->artifactProperties.removeAll(apinfo.first); + removeAll(m_productContext->product->artifactProperties, apinfo.first); } if (!isEnabled) return; @@ -1389,8 +1389,7 @@ void ProjectResolver::matchArtifactProperties(const ResolvedProductPtr &product, const QList<SourceArtifactPtr> &artifacts) { for (const SourceArtifactPtr &artifact : artifacts) { - for (const ArtifactPropertiesConstPtr &artifactProperties : - qAsConst(product->artifactProperties)) { + for (const ArtifactPropertiesConstPtr &artifactProperties : product->artifactProperties) { if (!artifact->isTargetOfModule() && artifact->fileTags.intersects(artifactProperties->fileTagsFilter())) { artifact->properties = artifactProperties->propertyMap(); |