Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +02:00
..
qicoimageformat	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qicon	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-13 12:46:46 +02:00
qimage	Darwin: Add QImage::toCGImage() conversion function	2016-08-11 21:21:05 +00:00
qimageiohandler	Updated license headers	2016-01-21 18:55:18 +00:00
qimagereader	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qimagewriter	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00
qmovie	Always build JPEG and GIF support as plugins	2016-04-07 09:08:41 +00:00
qpicture	Updated license headers	2016-01-21 18:55:18 +00:00
qpixmap	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-05 14:22:45 +02:00
qpixmapcache	Updated license headers	2016-01-21 18:55:18 +00:00
image.pro	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00