From d329a98fa9fade95537a6ff35b5898611cfadd0b Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Thu, 17 Mar 2022 14:17:02 +0100 Subject: [PATCH] Android: re-enable skipped tests Now when 71b3d18ea7962a01413966f793e8187c9e91685e is merged, we can re-enable the previously skipped tests, as they do not crash anymore. Task-number: QTBUG-101423 Task-number: QTBUG-101321 Task-number: QTBUG-87417 Pick-to: 6.3 6.2 Change-Id: I6b4b3619b0af5e48b5e92b514bc0ab6586a76d51 Reviewed-by: Assam Boudjelthia --- tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp | 4 ---- tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 3 --- .../widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp | 3 --- 3 files changed, 10 deletions(-) diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp index 8063f0ae47..08c3972843 100644 --- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp +++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp @@ -561,10 +561,6 @@ void tst_QDialog::transientParent() void tst_QDialog::dialogInGraphicsView() { -#ifdef Q_OS_ANDROID - // QTBUG-101321 - QSKIP("This test crashes on Android"); -#endif // QTBUG-49124: A dialog embedded into QGraphicsView has Qt::WA_DontShowOnScreen // set (as has a native dialog). It must not trigger the modal handling though // as not to lock up. diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp index 6db4ab7062..64cc0dc05c 100644 --- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp @@ -3279,9 +3279,6 @@ 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"); { diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index 08883f8c34..ec695b4bc1 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -1229,9 +1229,6 @@ void tst_QPlainTextEdit::canPaste() void tst_QPlainTextEdit::ensureCursorVisibleOnInitialShow() { -#ifdef Q_OS_ANDROID - QSKIP("This test crashed on Android"); -#endif QString manyPagesOfPlainText; for (int i = 0; i < 800; ++i) manyPagesOfPlainText += QLatin1String("Blah blah blah blah blah blah\n");