diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-04-26 10:29:09 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-04-27 08:25:29 +0000 |
| commit | 235dfa540fb694ba6f9ccc5472bb38b97c0925d8 (patch) | |
| tree | d13830712064798d9fc39c0c302594a0f9adf9d0 /src/lib/corelib/language | |
| parent | e142ad0c874a002e3d30035d112cf1e917d2879d (diff) | |
Make Rule::artifacts a vector
The value_type is not suitable for QList.
Change-Id: I79d57f5c70a60420804b11623dd1763c897ee060
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/language')
| -rw-r--r-- | src/lib/corelib/language/language.cpp | 7 | ||||
| -rw-r--r-- | src/lib/corelib/language/language.h | 2 |
2 files changed, 4 insertions, 5 deletions
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 |