Liang Qi 8f569c740a Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: config.tests/common/atomic64/atomic64.cpp configure src/3rdparty/forkfd/forkfd.c src/corelib/io/forkfd_qt.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tools/configure/configureapp.cpp Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414		2016-01-19 10:03:01 +01:00
..
access	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
bearer	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
kernel	winrt: Use winsock2 API for hostname resolution on WinRT/WinPhone	2016-01-05 08:14:31 +00:00
socket	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00
ssl	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00