aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/blackbox/tst_blackboxandroid.cpp
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-10-24 10:50:33 -0700
committerJake Petroules <jake.petroules@qt.io>2017-11-16 15:11:15 +0000
commit4432ba4949647917d0fc3fb2ef73f9737a7c2431 (patch)
treee36f48e90f7019ad0ecfb7046638cebf3410930e /tests/auto/blackbox/tst_blackboxandroid.cpp
parenta0c61e70eeefbf9d6c632a94d29bcc2a7e97b7d7 (diff)
STL compatibility: use empty() instead of isEmpty()
This is a simple find and replace with manual sanity check. Change-Id: Iab6d46dcc3be246d1650aae2b1730f933b717be8 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxandroid.cpp')
-rw-r--r--tests/auto/blackbox/tst_blackboxandroid.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp
index 673feb54b..8fba0d78e 100644
--- a/tests/auto/blackbox/tst_blackboxandroid.cpp
+++ b/tests/auto/blackbox/tst_blackboxandroid.cpp
@@ -122,9 +122,9 @@ void TestBlackboxAndroid::android()
}
missingExpectedFiles << expectedFile;
}
- if (!missingExpectedFiles.isEmpty())
+ if (!missingExpectedFiles.empty())
QFAIL(QByteArray("missing expected files:\n") + missingExpectedFiles.join('\n'));
- if (!actualFiles.isEmpty()) {
+ 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) {
@@ -160,7 +160,7 @@ void TestBlackboxAndroid::android_data()
const SettingsPtr s = settings();
const Profile p("qbs_autotests-android", s.get());
QStringList archsStringList = p.value(QLatin1String("qbs.architectures")).toStringList();
- if (archsStringList.isEmpty())
+ if (archsStringList.empty())
archsStringList << QStringLiteral("armv7a"); // must match default in common.qbs
QByteArrayList archs;
std::transform(archsStringList.begin(), archsStringList.end(), std::back_inserter(archs),