Liang Qi dfc177e3a9 Merge remote-tracking branch 'origin/5.8' into dev ... Conflicts: qmake/library/qmakeevaluator.cpp (cherry picked from commit 1af6dc2c8fb4d91400fddc5050166f972ae57c9a in qttools) src/corelib/kernel/qcore_mac_objc.mm src/gui/painting/qcolor.h src/plugins/platforms/cocoa/qcocoawindow.mm Change-Id: I5b3ec468a5a9a73911b528d3d24ff8e19f339f31		2016-10-13 09:49:38 +02:00
..
access	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +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