summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/text/qglyphrun/BLACKLIST
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-11-09 10:34:33 +0100
committerLiang Qi <liang.qi@qt.io>2018-11-09 10:34:33 +0100
commitbc07958f922519bca1acc5930498ee0273576699 (patch)
treed5fda8e4458c2543458dbaeb7f4830c6d4750954 /tests/auto/gui/text/qglyphrun/BLACKLIST
parentb01a53fe328b37324c6e3ab38c50f156c93c6afe (diff)
parentdec7961709c90f6977d2447f7fa6c6625af41cb2 (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts: .qmake.conf qmake/Makefile.unix src/gui/text/qtextdocument.cpp src/gui/text/qtextdocument.h Change-Id: Iba26da0ecbf2aa4ff4b956391cfb373f977f88c9
Diffstat (limited to 'tests/auto/gui/text/qglyphrun/BLACKLIST')
0 files changed, 0 insertions, 0 deletions