Make Rule::artifacts a vector

The value_type is not suitable for QList.

Change-Id: I79d57f5c70a60420804b11623dd1763c897ee060
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 6 insertions, 7 deletions

diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp
index eda7ac3e5..ae7bf0134 100644
--- a/src/lib/corelib/api/project.cpp
+++ b/src/lib/corelib/api/project.cpp
@@ -678,7 +678,7 @@ void ProjectPrivate::updateInternalCodeLocations(const ResolvedProjectPtr &proje
             updateLocationIfNecessary(group->location, changeLocation, lineOffset);
         for (const RulePtr &rule : qAsConst(product->rules)) {
             updateLocationIfNecessary(rule->prepareScript.location(), changeLocation, lineOffset);
-            for (const RuleArtifactPtr &artifact : qAsConst(rule->artifacts)) {
+            for (const RuleArtifactPtr &artifact : rule->artifacts) {
                 for (auto &binding : artifact->bindings) {
                     updateLocationIfNecessary(binding.location, changeLocation, lineOffset);
                 }
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp
index 58e4a8d11..8a908b27c 100644
--- a/src/lib/corelib/buildgraph/rulesapplicator.cpp
+++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp
@@ -208,7 +208,7 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p
         handleRemovedRuleOutputs(m_completeInputSet, oldOutputs - newOutputs, m_logger);
     } else {
         Set<QString> outputFilePaths;
-        for (const RuleArtifactConstPtr &ruleArtifact : qAsConst(m_rule->artifacts)) {
+        for (const RuleArtifactConstPtr &ruleArtifact : m_rule->artifacts) {
             Artifact * const outputArtifact
                     = createOutputArtifactFromRuleArtifact(ruleArtifact, inputArtifacts,
                                                            &outputFilePaths);
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index a7956931d..435970132 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -287,7 +287,7 @@ bool Rule::acceptsAsInput(Artifact *artifact) const
 FileTags Rule::staticOutputFileTags() const
 {
     FileTags result;
-    for (const RuleArtifactConstPtr &artifact : qAsConst(artifacts))
+    for (const RuleArtifactConstPtr &artifact : artifacts)
         result.unite(artifact->fileTags);
     return result;
 }
@@ -857,9 +857,8 @@ QString keyFromElem(const RulePtr &r) {
     QString key = r->toString() + r->prepareScript.sourceCode();
     if (r->outputArtifactsScript.isValid())
         key += r->outputArtifactsScript.sourceCode();
-    for (const auto &a : qAsConst(r->artifacts)) {
+    for (const auto &a : r->artifacts)
         key += a->filePath;
-    }
     return key;
 }
 
@@ -889,7 +888,7 @@ bool operator==(const Rule &r1, const Rule &r2)
 {
     if (r1.artifacts.size() != r2.artifacts.size())
         return false;
-    for (int i = 0; i < r1.artifacts.size(); ++i) {
+    for (size_t i = 0; i < r1.artifacts.size(); ++i) {
         if (!equals(r1.artifacts.at(i).get(), r2.artifacts.at(i).get()))
             return false;
     }
diff --git a/src/lib/corelib/language/language.h b/src/lib/corelib/language/language.h
index ac8231da2..d4c69ae68 100644
--- a/src/lib/corelib/language/language.h
+++ b/src/lib/corelib/language/language.h
@@ -416,7 +416,7 @@ public:
     FileTags explicitlyDependsOn;
     bool multiplex;
     bool requiresInputs;
-    QList<RuleArtifactPtr> artifacts;           // unused, if outputFileTags/outputArtifactsScript is non-empty
+    std::vector<RuleArtifactPtr> artifacts;     // unused, if outputFileTags/outputArtifactsScript is non-empty
     bool alwaysRun;
 
     // members that we don't need to save