Liang Qi d1ea481345 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/network/access/qnetworkreply.cpp tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad		2017-05-07 13:08:18 +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-05-07 13:08:18 +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	QFileDevice/QFileInfo: Add fileTime() and setFileTime()	2017-04-27 18:44:15 +00:00
win	determine compiler version at build time, not in configure	2016-12-23 13:44:50 +00:00
x11	xcb: Add experimental legacy support for native X11 painting	2017-04-21 10:56:02 +00:00
.gitignore
.qmake.conf	make also configure tests not see %LIB% and %INCLUDE% under mingw	2016-10-17 13:44:43 +00:00