Liang Qi 17198e03ab Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/corelib/global/qglobal.cpp src/corelib/tools/qstring.cpp src/network/socket/qabstractsocket.cpp src/network/socket/qnativesocketengine_unix.cpp src/plugins/platforms/eglfs/api/qeglfsglobal.h Change-Id: Id5dfdbd30fa996f9b4b66a0b030b7d3b8c0ef288		2016-08-16 07:58:32 +02:00
..
images	ICO image format: fix regression in writing when size >= 256	2016-05-13 04:37:15 +00:00
.gitignore
qimagewriter.pro	Remove the traces of the discontinued android-no-sdk platform	2016-03-30 10:12:34 +00:00
qimagewriter.qrc	Android: Fix qimagewriter test.	2015-01-08 10:02:23 +01:00
tst_qimagewriter.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-08-16 07:58:32 +02:00