summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/text
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-16 01:00:11 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-05-16 01:00:11 +0200
commit264e66afb2739b502464e6ed972207bd3ea89d22 (patch)
tree8ea62cb4d48c900f5971c0645e70308fb6660f75 /tests/auto/gui/text
parent1e5deb06416b6efc33a2009d9678fd8f743c5ce7 (diff)
parentd441f6bba7b2aaf1e11b95c1ad4c785e6939f6ba (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'tests/auto/gui/text')
-rw-r--r--tests/auto/gui/text/qfontdatabase/BLACKLIST1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/gui/text/qfontdatabase/BLACKLIST b/tests/auto/gui/text/qfontdatabase/BLACKLIST
index 7f479e4b0e..0870ca11d7 100644
--- a/tests/auto/gui/text/qfontdatabase/BLACKLIST
+++ b/tests/auto/gui/text/qfontdatabase/BLACKLIST
@@ -1,3 +1,2 @@
[systemFixedFont] # QTBUG-54623
-winrt
b2qt