diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-01-18 10:26:00 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-01-18 10:48:38 +0000 |
commit | 8ba1aa806bdb313161acad22d9b16c33b295e607 (patch) | |
tree | aa86a7551f72e608ba109a415e21ec4f7a3b8aea /tests | |
parent | 0799a70bf79e7e8a7353711e49506bef98355543 (diff) |
Replace another find_if by none_of
Change-Id: I68445c362386c6c310ab098ce5ea6780c1232e42
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 58daa5b5e..b66c484e8 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -31,11 +31,13 @@ #include "../shared.h" #include <tools/profile.h> #include <tools/qttools.h> +#include <tools/stlutils.h> #include <QtCore/qjsondocument.h> #include <QtCore/qset.h> #include <QtCore/qtemporarydir.h> +using qbs::Internal::none_of; using qbs::Profile; QMap<QString, QString> TestBlackboxAndroid::findAndroid(int *status, const QString &profile) @@ -131,11 +133,10 @@ void TestBlackboxAndroid::android() QFAIL(QByteArray("missing expected files:\n") + missingExpectedFiles.join('\n')); if (!actualFiles.empty()) { QByteArray msg = "unexpected files encountered:\n" + actualFiles.join('\n'); - auto it = std::find_if(std::begin(actualFiles), std::end(actualFiles), - [](const QByteArray &f) { + auto isFileSharedObject = [](const QByteArray &f) { return f.endsWith(".so"); - }); - if (it == std::end(actualFiles)) + }; + if (none_of(actualFiles, isFileSharedObject)) QWARN(msg); else QFAIL(msg); |