From 79dcb2657c8ec37215f1f4306640f436e5874242 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Wed, 2 Mar 2022 17:17:01 +0100 Subject: [PATCH] Android: unblacklist tst_QPlainTextEdit tests Most of the blacklisted tests were already fixed earlier. The tst_QPlainTextEdit::adjustScrollbars() test needed a small fix to show the window non-fullscreen, so that the scrollbar could appear. Task-number: QTBUG-87423 Task-number: QTBUG-89402 Pick-to: 6.3 Change-Id: I849f411a5798053742323fc4db3fe30f2b690a8b Reviewed-by: Assam Boudjelthia --- .../auto/widgets/widgets/qplaintextedit/BLACKLIST | 15 --------------- .../widgets/qplaintextedit/tst_qplaintextedit.cpp | 4 +++- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 tests/auto/widgets/widgets/qplaintextedit/BLACKLIST diff --git a/tests/auto/widgets/widgets/qplaintextedit/BLACKLIST b/tests/auto/widgets/widgets/qplaintextedit/BLACKLIST deleted file mode 100644 index b71f2fcc0a..0000000000 --- a/tests/auto/widgets/widgets/qplaintextedit/BLACKLIST +++ /dev/null @@ -1,15 +0,0 @@ -# QTBUG-87423 -[copyAvailable] -android -[adjustScrollbars] -android -# QTBUG-89402 -[undoAvailableAfterPaste] -android -[copyAndSelectAllInReadonly] -android -[canPaste] -android -[updateCursorPositionAfterEdit] -android - diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp index e332201227..ec695b4bc1 100644 --- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp @@ -1371,7 +1371,9 @@ void tst_QPlainTextEdit::adjustScrollbars() ed->setFont(ff); ed->setMinimumSize(140, 100); ed->setMaximumSize(140, 100); - ed->show(); + // We use showNormal() here, because otherwise on Android the widget will + // be shown fullscreen, and the scrollbar will not appear. + ed->showNormal(); QLatin1String txt("\nabc def ghi jkl mno pqr stu vwx"); ed->setPlainText(txt + txt + txt + txt);