Liang Qi 7950b6b283 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d		2017-04-20 12:31:27 +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.9' into dev	2017-03-20 09:00:44 +01:00
qiconhighdpi	Implement support for Scale directory key according to Icon Theme spec	2017-02-01 13:58:01 +00:00
qimage	Fix PNGs saved from QImage transform of 8-bit images	2017-04-19 10:08:41 +00:00
qimageiohandler
qimagereader	ppm/pgm image formats: fix reading 16bit and limited range	2017-03-02 07:59:50 +00:00
qimagewriter	QImageWriter: Detect failure due to trying to write a QImage()	2017-02-27 18:03:33 +00:00
qmovie	Modularize configure.json/.pri	2016-09-15 08:23:53 +00:00
qpicture
qpixmap	QRasterPlatformPixmap::createPixmapForImage(): preserve DPR	2017-02-06 16:57:41 +00:00
qpixmapcache	Don't call releaseKey a second time if the insertion fails	2017-03-07 08:15:54 +00:00
image.pro	Implement support for Scale directory key according to Icon Theme spec	2017-02-01 13:58:01 +00:00