diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-05-15 09:01:29 +0200 |
| commit | 0ae26f8c574411cbab748128a317cc08dafe2382 (patch) | |
| tree | 41437d5d0ff7cc714ff37be23b25ca7ce6b792a6 /tests/auto/quick/qquicktextedit | |
| parent | d4042c8cd82b35b3ec67c4309d80c9c92f55d889 (diff) | |
| parent | 3ed33ec74b70bbac016dd080889bb3df3a78d90c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/quick/qquicktextedit/BLACKLIST
Change-Id: If1868d27ea40fdc206971c2f7a24e91c5e62b1bf
Diffstat (limited to 'tests/auto/quick/qquicktextedit')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/BLACKLIST | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktextedit/BLACKLIST b/tests/auto/quick/qquicktextedit/BLACKLIST index b8147a0ef9..48108566e0 100644 --- a/tests/auto/quick/qquicktextedit/BLACKLIST +++ b/tests/auto/quick/qquicktextedit/BLACKLIST @@ -8,3 +8,6 @@ opensuse-leap # QTBUG-82052 [linkHover] macos ci + +[hAlignVisual] +sles |