Liang Qi 0fc569184c Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase.cpp src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp src/widgets/widgets/qtabbar.cpp Change-Id: Iaa9daee5f7a6490d56257a3824730a35751ceb05		2017-04-06 14:16:31 +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.8' into 5.9	2017-04-06 14:16:31 +02:00
mac/corewlan	rewrite library handling in configure	2016-08-18 17:09:52 +00:00
qpa	Add eglfs-viv support for INTEGRITY	2017-01-18 13:04:38 +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
.qmake.conf	make also configure tests not see %LIB% and %INCLUDE% under mingw	2016-10-17 13:44:43 +00:00