Liang Qi 99cdd5fc67 Merge remote-tracking branch 'origin/5.13' into 5.14 ... Conflicts: src/corelib/global/qrandom.cpp src/corelib/io/qfileinfo.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/corelib/kernel/qeventdispatcher_win_p.h src/gui/text/qfontdatabase.cpp src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm src/plugins/platforms/windows/qwindowsglcontext.cpp src/testlib/qtestcase.cpp Done-With: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Done-With: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4893212471aa24be804c989a581810e2f714545c		2019-09-30 14:43:02 +02:00
..
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qfont.pro	Handle fonts that have commas/quotes in the family name	2018-11-08 16:08:25 +00:00
testfont.qrc	Handle fonts that have commas/quotes in the family name	2018-11-08 16:08:25 +00:00
tst_qfont.cpp	Merge remote-tracking branch 'origin/5.13' into 5.14	2019-09-30 14:43:02 +02:00
weirdfont.otf	Handle fonts that have commas/quotes in the family name	2018-11-08 16:08:25 +00:00