diff options
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/buildgraph/rulesapplicator.cpp | 2 | ||||
| -rw-r--r-- | tests/benchmarker/valgrindrunner.cpp | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 24405ec5b..7d53351c2 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -1084,7 +1084,7 @@ void Executor::checkForUnbuiltProducts() { if (m_buildOptions.executeRulesOnly()) return; - QList<ResolvedProductPtr> unbuiltProducts; + std::vector<ResolvedProductPtr> unbuiltProducts; for (const ResolvedProductPtr &product : m_productsToBuild) { bool productBuilt = true; for (BuildGraphNode *rootNode : qAsConst(product->buildData->rootNodes())) { diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 406f92783..16aa0c001 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -188,7 +188,7 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p qCDebug(lcBuildGraph) << "apply rule" << m_rule->toString() << toStringList(inputArtifacts).join(QLatin1String(",\n ")); - QList<std::pair<const RuleArtifact *, OutputArtifactInfo>> ruleArtifactArtifactMap; + std::vector<std::pair<const RuleArtifact *, OutputArtifactInfo>> ruleArtifactArtifactMap; QList<Artifact *> outputArtifacts; m_transformer = Transformer::create(); diff --git a/tests/benchmarker/valgrindrunner.cpp b/tests/benchmarker/valgrindrunner.cpp index 0441e1b10..344a23516 100644 --- a/tests/benchmarker/valgrindrunner.cpp +++ b/tests/benchmarker/valgrindrunner.cpp @@ -39,6 +39,7 @@ #include <QtConcurrent/qtconcurrentrun.h> +#include <deque> #include <mutex> namespace qbsBenchmarker { @@ -56,15 +57,17 @@ ValgrindRunner::ValgrindRunner(Activities activities, const QString &testProject void ValgrindRunner::run() { - QList<QFuture<void>> futures; + std::deque<QFuture<void>> futures; if (m_activities & ActivityResolving) futures.push_back(QtConcurrent::run(this, &ValgrindRunner::traceResolving)); if (m_activities & ActivityRuleExecution) futures.push_back(QtConcurrent::run(this, &ValgrindRunner::traceRuleExecution)); if (m_activities & ActivityNullBuild) futures.push_back(QtConcurrent::run(this, &ValgrindRunner::traceNullBuild)); - while (!futures.empty()) - futures.takeFirst().waitForFinished(); + while (!futures.empty()) { + futures.front().waitForFinished(); + futures.pop_front(); + } } void ValgrindRunner::traceResolving() |