Liang Qi 9808b53fde Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b		2016-11-15 09:58:16 +01:00
..
qicoimageformat	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00
qicon	Fix compilation without process support	2016-05-20 10:37:18 +00:00
qimage	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-01 10:03:21 +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.6' into 5.7	2016-08-13 01:05:02 +02:00
qmovie	Updated license headers	2016-01-21 18:55:18 +00:00
qpicture	Updated license headers	2016-01-21 18:55:18 +00:00
qpixmap	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01: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