Liang Qi ea438b2508 Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qsysinfo.h src/corelib/kernel/qcoreapplication_win.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/plugins/platforms/windows/qwindowsglcontext.cpp src/plugins/platforms/windows/qwindowsglcontext.h Change-Id: Ib3500acc2b28553bde06758cd9a2e19eb7fe2978		2016-06-21 08:39:41 +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	Merge remote-tracking branch 'origin/5.7' into dev	2016-06-21 08:39:41 +02: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-05-23 21:09:46 +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