diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-14 09:56:04 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-06-14 09:11:41 +0000 |
commit | a666dedaad7d63d758f57f6e58ca285f80b5f0cd (patch) | |
tree | 3eab33e4c82bb09700e7ddd5817893e5aca7caea /src | |
parent | d173e72b584bd4afa5567d8fcc614ee0cf71fc8c (diff) |
Make RescuableArtifactData::children a std::vector
The value_type ChildData is not suitable for QList.
Change-Id: I33057a739c26e36a7c6dabc44dad72262a05cdb0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/corelib/buildgraph/buildgraphloader.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/buildgraph/rescuableartifactdata.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index 9890a8327..f9b9910e6 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -888,7 +888,7 @@ void BuildGraphLoader::rescueOldBuildData(const ResolvedProductConstPtr &restore = oldArtifact->transformer->lastPrepareScriptExecutionTime; const ChildrenInfo &childrenInfo = childLists.value(oldArtifact); for (Artifact * const child : qAsConst(childrenInfo.children)) { - rad.children << RescuableArtifactData::ChildData(child->product->name, + rad.children.emplace_back(child->product->name, child->product->multiplexConfigurationId, child->filePath(), childrenInfo.childrenAddedByScanner.contains(child)); std::transform(oldArtifact->fileDependencies.cbegin(), diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index f82833e7e..980e2182a 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -775,7 +775,7 @@ void Executor::rescueOldBuildData(Artifact *artifact, bool *childrenAdded = 0) bool canRescue = artifact->transformer->commands == rad.commands; if (canRescue) { ResolvedProductPtr pseudoProduct = ResolvedProduct::create(); - for (const RescuableArtifactData::ChildData &cd : qAsConst(rad.children)) { + for (const RescuableArtifactData::ChildData &cd : rad.children) { pseudoProduct->name = cd.productName; pseudoProduct->multiplexConfigurationId = cd.productMultiplexId; Artifact * const child = lookupArtifact(pseudoProduct, m_project->buildData.get(), diff --git a/src/lib/corelib/buildgraph/rescuableartifactdata.h b/src/lib/corelib/buildgraph/rescuableartifactdata.h index fbcf8a9d4..a88d63273 100644 --- a/src/lib/corelib/buildgraph/rescuableartifactdata.h +++ b/src/lib/corelib/buildgraph/rescuableartifactdata.h @@ -54,7 +54,6 @@ #include <tools/persistence.h> #include <QtCore/qhash.h> -#include <QtCore/qlist.h> #include <vector> @@ -103,7 +102,7 @@ public: }; FileTime timeStamp; - QList<ChildData> children; + std::vector<ChildData> children; std::vector<QString> fileDependencies; bool knownOutOfDate = false; |