Liang Qi 6755ec891a Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: configure qmake/Makefile.unix.macos qmake/Makefile.unix.win32 qmake/generators/win32/msvc_vcproj.cpp src/3rdparty/pcre/qt_attribution.json src/corelib/io/qsettings.cpp src/corelib/kernel/qdeadlinetimer.cpp src/platformsupport/kmsconvenience/qkmsdevice.cpp src/platformsupport/kmsconvenience/qkmsdevice_p.h src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h tests/manual/qstorageinfo/printvolumes.cpp tools/configure/configureapp.cpp Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e		2016-12-13 09:39:20 +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	macOS: Don't build auto-tests as application bundles unless explicitly requested	2016-10-23 10:39:56 +00: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