Liang Qi 3e71810cf3 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qhttpnetworkconnection.cpp src/network/access/qhttpnetworkconnection_p.h Change-Id: I11f8641ef482efa8cee1b79977d19cc3182814b4		2016-10-08 17:15:55 +02:00
..
accessibility	Updated license headers	2016-01-15 12:25:24 +00:00
cglconvenience	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-05 13:57:12 +02:00
clipboard	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-07-15 20:47:57 +02:00
dbusmenu	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
dbustray	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-08 17:15:55 +02:00
devicediscovery	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
eglconvenience	Add X11 support for the DRIVE CX	2016-08-10 11:24:23 +00:00
eventdispatchers	Updated license headers	2016-01-15 12:25:24 +00:00
fbconvenience	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +02:00
fontdatabases	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-23 22:28:33 +02:00
glxconvenience	X11: Better support non-32bit visuals	2016-04-09 05:17:27 +00:00
graphics	Updated license headers	2016-01-15 12:25:24 +00:00
input	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-09-21 07:14:40 +02:00
linuxaccessibility	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-13 01:05:02 +02:00
platformcompositor	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-02-18 20:50:35 +01:00
services	Use QStringLiteral more judiciously	2016-07-08 06:43:02 +00:00
themes	Use QStringLiteral more judiciously	2016-07-08 06:43:02 +00:00
platformsupport.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00