Liang Qi 1fadc7292b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/plugins/platforms/windows/qwindowsfontengine.cpp src/plugins/platforms/windows/qwindowsnativeimage.cpp tests/auto/gui/kernel/qwindow/BLACKLIST tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I649b32b260ce0ed2d6a5089021daa0d6a8db85f7		2016-02-24 13:31:14 +01:00
..
.gitignore	…
BLACKLIST	Autotest: Blacklist tst_QFontDialog::setFont()	2016-02-23 07:30:34 +00:00
qfontdialog.pro	Link to AppKit instead of Cocoa.	2015-09-05 11:49:17 +00:00
testfonts.qrc	QStyleSheetStyle: Don't interfere with QFontDialog	2014-10-24 16:59:26 +02:00
tst_qfontdialog.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
tst_qfontdialog_mac_helpers.mm	Updated license headers	2016-01-21 18:55:18 +00:00