diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-18 08:52:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-18 08:52:33 +0200 |
| commit | 2cd6d76d680b1bddef774acc51d80da9e29f1c2e (patch) | |
| tree | 69f2aac58f25223910debd0f20b9d5550c69541c /tests/auto/gui/text/qtextdocumentlayout | |
| parent | b800f3039a754f67466df5e195e70ea2821f9404 (diff) | |
| parent | 786ae0141a524c66e01e652aed0e6ed4c97d08bc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/text/qbytearray.cpp
Change-Id: I63706409464d31391012bacdadfd1f6300509787
Diffstat (limited to 'tests/auto/gui/text/qtextdocumentlayout')
| -rw-r--r-- | tests/auto/gui/text/qtextdocumentlayout/BLACKLIST | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/gui/text/qtextdocumentlayout/BLACKLIST b/tests/auto/gui/text/qtextdocumentlayout/BLACKLIST index 5c81e74aa0..e646d71144 100644 --- a/tests/auto/gui/text/qtextdocumentlayout/BLACKLIST +++ b/tests/auto/gui/text/qtextdocumentlayout/BLACKLIST @@ -2,3 +2,4 @@ rhel-6.6 rhel-7.4 rhel-7.6 +sles |