diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-03-02 17:17:01 +0100 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-03-04 22:20:18 +0100 |
| commit | 79dcb2657c8ec37215f1f4306640f436e5874242 (patch) | |
| tree | 1b52cf19d06e7de478f8a52f2fbb723b26783349 /tests/auto/widgets | |
| parent | e0023ae353a7c208ce0300466955036a117370c8 (diff) | |
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 <assam.boudjelthia@qt.io>
Diffstat (limited to 'tests/auto/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qplaintextedit/BLACKLIST | 15 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp | 4 |
2 files changed, 3 insertions, 16 deletions
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); |