Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: .qmake.conf config.tests/unix/nis/nis.cpp mkspecs/unsupported/freebsd-g++/qplatformdefs.h src/corelib/tools/qdatetime.cpp src/corelib/tools/qsimd.cpp src/corelib/tools/qsimd_p.h src/network/access/access.pri src/network/access/qnetworkreplynsurlconnectionimpl.mm src/network/access/qnetworkreplynsurlconnectionimpl_p.h src/plugins/platforms/cocoa/qnsview.mm src/plugins/printsupport/windows/qwindowsprintdevice.cpp tests/auto/corelib/kernel/qobject/tst_qobject.cpp tests/auto/network/access/qnetworkreply/BLACKLIST tests/auto/widgets/widgets/qopenglwidget/BLACKLIST Change-Id: I4b32055bbf922392ef0264fd403405416fffee57		2016-06-06 09:04:55 +02:00
..
access	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
socket	Revert "tst_qudpsocket - remove insignificant"	2016-05-13 19:07:56 +00:00
ssl	tst_qsslsocket::protocolServerSide - blacklist on RHEL 7.2	2016-05-26 10:47:42 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00