Frederik Gladhorn 7c495cfea9 Merge remote-tracking branch 'origin/5.3' into dev ... Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8		2014-07-14 10:35:51 +02:00
..
.gitignore	Moved gui autotests into new directory structure	2011-09-01 10:59:49 +02:00
qfont.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
tst_qfont.cpp	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00