Liang Qi 8c57e8c012 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/network/socket/qnativesocketengine_p.h src/network/ssl/qsslsocket_mac.cpp src/network/ssl/qsslsocket_mac_p.h src/widgets/kernel/qwidget.cpp Change-Id: I39592cb37d710dfaf8640769ba3c1b637927d7f4		2015-11-27 08:35:45 +01:00
..
resources	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
qfiledialog.pro	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
tst_qfiledialog.cpp	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-11-27 08:35:45 +01:00