Liang Qi 5d6073be27 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: mkspecs/linux-icc/qmake.conf mkspecs/macx-icc/qmake.conf mkspecs/win32-icc/qmake.conf src/gui/painting/qgrayraster.c Change-Id: Ib08c45ea3215be05f986ecb3e1f4b37d209aa775		2017-04-07 10:24:33 +02:00
..
arch	Make build ABI available as qmake variable	2017-03-28 06:51:42 +00:00
common	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-07 10:24:33 +02:00
mac/corewlan	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
qpa	Basic Vulkan enablers	2017-03-17 16:12:03 +00:00
unix	PCRE2: fix the configure test	2017-03-28 07:09:01 +00:00
win	determine compiler version at build time, not in configure	2016-12-23 13:44:50 +00:00
x11	remove unused Xlib's XRender dependency	2017-02-24 19:42:21 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	make also configure tests not see %LIB% and %INCLUDE% under mingw	2016-10-17 13:44:43 +00:00