Simon Hausmann ff922e7b87 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a		2020-03-16 18:41:27 +01:00
..
images	QImage/Jpeg: decode/encode comment attributes as utf-8	2018-03-18 09:29:06 +00:00
.gitignore
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
qimage.pro	Migrate Windows system libs to external dependencies	2019-05-08 08:30:02 +00:00
qimage.qrc	Android: Fix qimage test.	2015-01-08 10:09:39 +01:00
tst_qimage.cpp	Add test for conversion of "large" images	2020-03-11 18:45:46 +00:00