qt5base-lts/tests/auto/widgets/dialogs/qfontdialog
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
.gitignore Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qfontdialog.pro QStyleSheetStyle: Don't interfere with QFontDialog 2014-10-24 16:59:26 +02:00
testfonts.qrc QStyleSheetStyle: Don't interfere with QFontDialog 2014-10-24 16:59:26 +02:00
tst_qfontdialog_mac_helpers.mm Add shared implementation of a NSAutoreleasePool wrapper to qglobal 2015-05-27 18:45:29 +00:00
tst_qfontdialog.cpp Font definitions with different style names are not equal 2015-06-03 14:00:07 +00:00