diff options
author | Andreas Buhr <andreas.buhr@qt.io> | 2022-02-23 16:02:51 +0100 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-25 14:49:18 +0000 |
commit | 58743ad8f0880719125575d6dddb4b33d9d59601 (patch) | |
tree | 7faecccbcf6cfed253e8dcf4b4679dcd888bb346 /tests | |
parent | ceaea83fbdc896b3aed780e39fb26bd3dbc9acb6 (diff) |
Fix tst_qformlayout::wrapping on Android
The content of the window was intended to trigger wrapping.
On Android, the window is larger, so more content is
necessary. This patch adds more content.
Fixes: QTBUG-87401
Change-Id: I33a2fe4560c358f2b0b83523ee4ab26bb5dd2513
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit c57e2b5d513e8bd9d1b9826d46babd9ef7d5aa57)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/widgets/kernel/qformlayout/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/widgets/kernel/qformlayout/BLACKLIST b/tests/auto/widgets/kernel/qformlayout/BLACKLIST index 375682e788..e69de29bb2 100644 --- a/tests/auto/widgets/kernel/qformlayout/BLACKLIST +++ b/tests/auto/widgets/kernel/qformlayout/BLACKLIST @@ -1,3 +0,0 @@ -# QTBUG-87401 -[wrapping] -android diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp index 4aa9f8ac2d..f4562543f9 100644 --- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp +++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp @@ -274,7 +274,9 @@ void tst_QFormLayout::wrapping() fl->setRowWrapPolicy(QFormLayout::WrapLongRows); QLineEdit *le = new QLineEdit; - QLabel *lbl = new QLabel("A long label"); + QLabel *lbl = new QLabel("A long label which is actually long enough to trigger wrapping," + " even on Android and even if it is executed on a tiling window" + " manager which forces the window into fullscreen mode."); le->setMinimumWidth(200); fl->addRow(lbl, le); |