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
..
qcolordialog	tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 11:50:10 +00:00
qdialog	Suppress the modal window handling for dialogs embedded into QGraphicsView.	2015-11-04 13:43:29 +00:00
qerrormessage	Update copyright headers	2015-02-11 06:49:51 +00:00
qfiledialog	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-11-27 08:35:45 +01:00
qfiledialog2	Improve messages in tst_qdir/tst_fileinfo/tst_qfiledialog2.	2015-09-30 17:27:58 +00:00
qfilesystemmodel	Tests: Always verify whether QTemporaryDir/File creation succeeded.	2015-09-28 15:05:43 +00:00
qfontdialog	Blacklist tst_qfontdialog::setFont on RHEL 6.6	2015-11-13 20:31:55 +00:00
qinputdialog	Update copyright headers	2015-02-11 06:49:51 +00:00
qmessagebox	QMessageBox test: Refactor closing dialogs.	2015-11-05 13:53:50 +00:00
qprogressdialog	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qsidebar	Update copyright headers	2015-02-11 06:49:51 +00:00
qwizard	tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 11:50:10 +00:00
dialogs.pro	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00