diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2021-12-01 21:57:28 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2021-12-02 11:01:45 +0000 |
| commit | c470f57036b3b60acf68f931faff33bfd094f23e (patch) | |
| tree | 082d9211ca562ee323dd472c2be8d0afe898b4aa | |
| parent | 3add520ef612716df5dc5c896041c1c70e52015f (diff) | |
Replace missing std::all_of with Internal::all_of
Change-Id: I11dc7ce71c7ce7f161d75e3fcd2fc34c87e7733e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp index 4c3cf7001..3df2b3625 100644 --- a/src/lib/corelib/buildgraph/executor.cpp +++ b/src/lib/corelib/buildgraph/executor.cpp @@ -620,8 +620,7 @@ void Executor::finishJob(ExecutorJob *job, bool success) static bool allChildrenBuilt(BuildGraphNode *node) { - return std::all_of(node->children.cbegin(), node->children.cend(), - std::mem_fn(&BuildGraphNode::isBuilt)); + return Internal::all_of(node->children, std::mem_fn(&BuildGraphNode::isBuilt)); } void Executor::finishNode(BuildGraphNode *leaf) diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 4d4b94a96..8109299cc 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -174,7 +174,7 @@ void TestBlackboxAndroid::android() return f.contains("qmltooling"); }; if (none_of(actualFiles, isFileSharedObject) - || std::all_of(actualFiles.cbegin(), actualFiles.cend(), isQmlToolingLib)) { + || qbs::Internal::all_of(actualFiles, isQmlToolingLib)) { qWarning() << msg; } else { QFAIL(msg); |