Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b		2014-11-24 13:39:13 +01:00
..
qicoimageformat	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qicon	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qimage	Merge remote-tracking branch 'origin/5.4' into dev	2014-11-24 13:39:13 +01:00
qimageiohandler	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qimagereader	Merge remote-tracking branch 'origin/5.4' into dev	2014-09-29 14:08:49 +02:00
qimagewriter	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qmovie	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpicture	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpixmap	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
qpixmapcache	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
image.pro	Check for network module when building according auto tests	2013-02-19 19:20:53 +01:00