From 21e721667012aee46fc3b01ef895ac4436aded91 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 22 Mar 2022 18:34:29 +0100 Subject: [PATCH] Android: activate tst_QLineEdit Skip some of the obviously failing QCompleter-related tests instead of blacklisting them. Skip a test that causes a crash. This allows to re-enable this test in CMakeLists.txt for Android. Task-number: QTBUG-87417 Pick-to: 6.3 6.2 Change-Id: Ie7ee708df8ceddf117689e8ac749850ba86e8816 Reviewed-by: Qt CI Bot Reviewed-by: Assam Boudjelthia --- tests/auto/widgets/widgets/CMakeLists.txt | 3 +-- tests/auto/widgets/widgets/qlineedit/BLACKLIST | 6 ------ tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 9 +++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/auto/widgets/widgets/CMakeLists.txt b/tests/auto/widgets/widgets/CMakeLists.txt index e3e8aba925..37f819a48f 100644 --- a/tests/auto/widgets/widgets/CMakeLists.txt +++ b/tests/auto/widgets/widgets/CMakeLists.txt @@ -47,9 +47,8 @@ if(QT_FEATURE_shortcut) add_subdirectory(qkeysequenceedit) endif() add_subdirectory(qmenu) +add_subdirectory(qlineedit) if(NOT ANDROID) - # QTBUG-87417 # special case - add_subdirectory(qlineedit) # QTBUG-87420 # special case add_subdirectory(qmdiarea) # QTBUG-87421 # special case diff --git a/tests/auto/widgets/widgets/qlineedit/BLACKLIST b/tests/auto/widgets/widgets/qlineedit/BLACKLIST index 9f87a6d921..a459495d1a 100644 --- a/tests/auto/widgets/widgets/qlineedit/BLACKLIST +++ b/tests/auto/widgets/widgets/qlineedit/BLACKLIST @@ -3,13 +3,7 @@ android [leftKeyOnSelectedText] android -[cutWithoutSelection] -android -[inlineCompletion] -android [textMargin] android -[task210502_caseInsensitiveInlineCompletion] -android [testQuickSelectionWithMouse] android diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 9d3c03709f..6db4ab7062 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3279,6 +3279,9 @@ void tst_QLineEdit::returnPressedKeyEvent() void tst_QLineEdit::keepSelectionOnTabFocusIn() { +#ifdef Q_OS_ANDROID + QSKIP("This test crashes on Android, see QTBUG-101321 to track fix progress"); +#endif QLineEdit *testWidget = ensureTestWidget(); testWidget->setText("hello world"); { @@ -3430,6 +3433,9 @@ void tst_QLineEdit::leftKeyOnSelectedText() void tst_QLineEdit::inlineCompletion() { +#ifdef Q_OS_ANDROID + QSKIP("QCompleter does not work on Android, see QTBUG-77174"); +#endif if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why."); @@ -3827,6 +3833,9 @@ void tst_QLineEdit::task198789_currentCompletion() void tst_QLineEdit::task210502_caseInsensitiveInlineCompletion() { +#ifdef Q_OS_ANDROID + QSKIP("QCompleter does not work on Android, see QTBUG-77174"); +#endif if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why.");