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
..
arch	PowerPC: Add detection of SPE (found on e500) and VSX	2016-06-19 18:46:26 +00:00
common	Fix issue causing pch configure test to always fail	2016-08-24 20:36:05 +00:00
mac/corewlan	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
qpa	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
unix	Merge remote-tracking branch 'origin/5.8' into dev	2016-10-13 09:49:38 +02:00
win	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
x11	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00