Liang Qi 942ab49072 Merge remote-tracking branch 'origin/5.11' into dev ... Conflicts: src/corelib/tools/tools.pri Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9		2018-02-16 08:54:58 +01:00
..
qicoimageformat	Merge remote-tracking branch 'origin/5.7' into dev	2016-05-23 21:09:46 +02:00
qicon	Introduce QIcon::fallbackSearchPaths()	2018-01-15 10:12:22 +00:00
qiconhighdpi	qt_findAtNxFile(): account for .9 (9-patch image) extensions	2017-06-24 21:24:53 +00:00
qimage	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
qimageiohandler	Updated license headers	2016-01-21 18:55:18 +00:00
qimagereader	Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags	2018-01-20 18:16:59 +00:00
qimagewriter	Merge remote-tracking branch 'origin/5.9' into 5.11	2018-02-14 12:51:24 +01:00
qmovie	Fix a crash when QMovie::speed is set to 0	2018-01-24 10:13:00 +00:00
qpicture	Updated license headers	2016-01-21 18:55:18 +00:00
qpixmap	Add overloaded QBitmap::fromImage that takes QImage rvalue	2018-02-07 12:10:32 +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