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
..
configure	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
shared/windows	Updated license headers	2016-01-21 18:55:18 +00:00