Liang Qi 9419dfe8ee Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd		2017-04-04 18:09: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-03-14 10:52:24 +01: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