Liang Qi ef25620ac1 Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/features/mac/default_pre.prf mkspecs/features/qpa/genericunixfontdatabase.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/resolve_config.prf mkspecs/macx-ios-clang/features/default_post.prf mkspecs/macx-ios-clang/features/resolve_config.prf src/corelib/io/qiodevice.cpp Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491		2016-10-06 20:12:27 +02:00
..
access	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-10-06 20:12:27 +02:00
bearer	Updated license headers	2016-01-21 18:55:18 +00:00
kernel	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00
socket	Modularize configure.json/.pri	2016-09-15 08:23:53 +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