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
..
dialogs	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-10-02 16:59:55 +02:00
doc	Doc: Update examplesinstallpath to include the repository name	2015-10-21 09:50:16 +00:00
kernel	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-11-27 08:35:45 +01:00
widgets	Make QWidget *=0, Qt::WindowFlags f=0 functions use Q_NULLPTR	2015-07-04 06:03:52 +00:00
printsupport.pro	Revert "Automatically link printsupport plugins to static applications."	2014-04-18 07:44:57 +02:00