From 8d76c5af518599800657ab40d56df4dfbc0a0e85 Mon Sep 17 00:00:00 2001 From: Samuel Mira Date: Fri, 4 Nov 2022 15:02:22 +0200 Subject: Android: Fix qfiledialog test for emulator bump to API 24 The qfiledialog test was failing on completer_data test. The fix available for Android 11 also works in Android 7, so removed the if clause. Task-number: QTBUG-105377 Change-Id: I76a4c1073a754c9b299cfe731f42b80da1a6f8e2 Reviewed-by: Assam Boudjelthia --- tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp index 00c38b9752..d7faf8a76b 100644 --- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp @@ -422,13 +422,9 @@ void tst_QFiledialog::completer_data() QDir dir = QDir::root(); #ifdef Q_OS_ANDROID - // Android 11 and above doesn't allow accessing root filesystem as before, - // so let's opt int for the app's home. - if (QNativeInterface::QAndroidApplication::sdkVersion() >= 30) { - const auto homePaths = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); - QVERIFY(!homePaths.isEmpty()); - dir = QDir(homePaths.first()); - } + const auto homePaths = QStandardPaths::standardLocations(QStandardPaths::HomeLocation); + QVERIFY(!homePaths.isEmpty()); + dir = QDir(homePaths.first()); #endif QFileInfoList list = dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot); -- cgit v1.2.3