Frederik Gladhorn 6aa09bbce5 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/plugins/platforms/android/qandroidplatformtheme.h Change-Id: I541bd3069df3ab54c7942d5f4a9e155e3b6566a0		2014-02-18 14:19:36 +01: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/stable' into dev	2014-02-18 14:19:36 +01:00