Liang Qi b131503361 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure configure.pri examples/widgets/painting/fontsampler/mainwindow.cpp examples/widgets/painting/fontsampler/mainwindow.h mkspecs/features/moc.prf src/corelib/global/qglobal.h src/gui/text/qtextdocument.cpp Change-Id: Ica65512e00871695190a14ccea5c275b0165f787		2016-12-16 16:38:33 +01:00
..
access	Merge remote-tracking branch 'origin/5.8' into dev	2016-11-02 09:24:11 +01:00
bearer	Add configurable connect timeout for QAbstractSocket	2016-11-29 14:01:47 +00:00
kernel	Merge remote-tracking branch 'origin/5.8' into dev	2016-12-16 16:38:33 +01:00
socket	Fix warnings in tests (MinGW/MSCV)	2016-11-29 17:08:46 +00:00
ssl	remove redundant conditionals regarding ssl	2016-10-04 08:25:24 +00:00
network.pro	Re-enable network tests on Mac OS.	2012-04-24 16:06:28 +02:00