1 files changed, 33 insertions, 12 deletions

diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index 76b12d7aea..b33c819ee0 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -57,7 +57,7 @@ QString CsvCompleter::pathFromIndex(const QModelIndex &sourceIndex) const
         idx = parent.sibling(parent.row(), sourceIndex.column());
     } while (idx.isValid());
 
-    return list.count() == 1 ? list.constFirst() : list.join(QLatin1Char(','));
+    return list.size() == 1 ? list.constFirst() : list.join(QLatin1Char(','));
 }
 
 class tst_QCompleter : public QObject
@@ -151,6 +151,16 @@ tst_QCompleter::~tst_QCompleter()
     delete completer;
 }
 
+#ifdef Q_OS_ANDROID
+static QString androidHomePath()
+{
+    const auto homePaths = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
+    QDir dir = homePaths.isEmpty() ? QDir() : homePaths.first();
+    dir.cdUp();
+    return dir.path();
+}
+#endif
+
 void tst_QCompleter::setSourceModel(ModelType type)
 {
     QTreeWidgetItem *parent, *child;
@@ -203,7 +213,13 @@ void tst_QCompleter::setSourceModel(ModelType type)
         completer->setCsvCompletion(false);
         {
             auto m = new QFileSystemModel(completer);
+#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.
+            m->setRootPath(androidHomePath());
+#else
             m->setRootPath("/");
+#endif
             completer->setModel(m);
         }
         completer->setCompletionColumn(0);
@@ -590,7 +606,9 @@ void tst_QCompleter::fileSystemModel_data()
 //        QTest::newRow("(/d)") << "/d" << "" << "Developer" << "/Developer";
 #elif defined(Q_OS_ANDROID)
         QTest::newRow("()") << "" << "" << "/" << "/";
-        QTest::newRow("(/et)") << "/et" << "" << "etc" << "/etc";
+        const QString androidDir = androidHomePath();
+        const QString tag = QStringLiteral("%1/fil").arg(androidDir);
+        QTest::newRow(tag.toUtf8().data()) << tag << "" << "files" << androidDir + "/files";
 #else
         QTest::newRow("()") << "" << "" << "/" << "/";
 #if !defined(Q_OS_AIX) && !defined(Q_OS_HPUX) && !defined(Q_OS_QNX)
@@ -1158,10 +1176,10 @@ void tst_QCompleter::disabledItems()
     QAbstractItemView *view = lineEdit.completer()->popup();
     QVERIFY(view->isVisible());
     QTest::mouseClick(view->viewport(), Qt::LeftButton, {}, view->visualRect(view->model()->index(0, 0)).center());
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     QVERIFY(view->isVisible());
     QTest::mouseClick(view->viewport(), Qt::LeftButton, {}, view->visualRect(view->model()->index(1, 0)).center());
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     QVERIFY(!view->isVisible());
 }
 
@@ -1175,7 +1193,7 @@ void tst_QCompleter::task178797_activatedOnReturn()
     auto completer = new QCompleter({"foobar1", "foobar2"}, &ledit);
     ledit.setCompleter(completer);
     QSignalSpy spy(completer, QOverload<const QString &>::of(&QCompleter::activated));
-    QCOMPARE(spy.count(), 0);
+    QCOMPARE(spy.size(), 0);
     ledit.move(200, 200);
     ledit.show();
     QApplication::setActiveWindow(&ledit);
@@ -1187,7 +1205,7 @@ void tst_QCompleter::task178797_activatedOnReturn()
     QCoreApplication::processEvents();
     QTest::keyClick(QApplication::activePopupWidget(), Qt::Key_Return);
     QCoreApplication::processEvents();
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
 }
 
 class task189564_StringListModel : public QStringListModel
@@ -1269,7 +1287,7 @@ void tst_QCompleter::task246056_setCompletionPrefix()
     QTest::keyPress(comboBox.completer()->popup(), Qt::Key_Down);
     QTest::keyPress(comboBox.completer()->popup(), Qt::Key_Down);
     QTest::keyPress(comboBox.completer()->popup(), Qt::Key_Enter); // don't crash!
-    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.size(), 1);
     const auto index = spy.at(0).constFirst().toModelIndex();
     QVERIFY(!index.isValid());
 }
@@ -1743,10 +1761,10 @@ void tst_QCompleter::QTBUG_52028_tabAutoCompletes()
     QTRY_VERIFY(cbox.completer()->popup()->isVisible());
     QTest::keyClick(cbox.completer()->popup(), Qt::Key_Tab);
     QCOMPARE(cbox.completer()->currentCompletion(), QLatin1String("hux"));
-    QCOMPARE(activatedSpy.count(), 0);
+    QCOMPARE(activatedSpy.size(), 0);
     QEXPECT_FAIL("", "QTBUG-52028 will not be fixed today.", Abort);
     QCOMPARE(cbox.currentText(), QLatin1String("hux"));
-    QCOMPARE(activatedSpy.count(), 0);
+    QCOMPARE(activatedSpy.size(), 0);
     QVERIFY(!le->hasFocus());
 }
 
@@ -1787,7 +1805,7 @@ void tst_QCompleter::QTBUG_51889_activatedSentTwice()
     QTRY_VERIFY(cbox.completer()->popup()->isVisible());
     QTest::keyClick(cbox.completer()->popup(), Qt::Key_Down);
     QTest::keyClick(cbox.completer()->popup(), Qt::Key_Return);
-    QTRY_COMPARE(activatedSpy.count(), 1);
+    QTRY_COMPARE(activatedSpy.size(), 1);
 
     // Navigate + enter activates only once (non-first item)
     cbox.lineEdit()->clear();
@@ -1797,7 +1815,7 @@ void tst_QCompleter::QTBUG_51889_activatedSentTwice()
     QTRY_VERIFY(cbox.completer()->popup()->isVisible());
     QTest::keyClick(cbox.completer()->popup(), Qt::Key_Down);
     QTest::keyClick(cbox.completer()->popup(), Qt::Key_Return);
-    QTRY_COMPARE(activatedSpy.count(), 1);
+    QTRY_COMPARE(activatedSpy.size(), 1);
 
     // Full text + enter activates only once
     cbox.lineEdit()->clear();
@@ -1806,11 +1824,14 @@ void tst_QCompleter::QTBUG_51889_activatedSentTwice()
     QVERIFY(cbox.completer()->popup());
     QTRY_VERIFY(cbox.completer()->popup()->isVisible());
     QTest::keyClick(&cbox, Qt::Key_Return);
-    QTRY_COMPARE(activatedSpy.count(), 1);
+    QTRY_COMPARE(activatedSpy.size(), 1);
 }
 
 void tst_QCompleter::showPopupInGraphicsView()
 {
+    if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive))
+        QSKIP("Wayland: Skip this test, see also QTBUG-107186");
+
     QGraphicsView view;
     QGraphicsScene scene;
     view.setScene(&scene);