Liang Qi 0ca4fcbc36 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/plugins/platforms/xcb/qxcbintegration.cpp Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f		2016-08-18 11:07:51 +02:00
..
images	Purge sRGB chunks from PNGs in tests.	2016-03-29 08:39:43 +00:00
scripts	Fixup for text labels in lancelot graphics test	2016-03-31 10:27:39 +00:00
.gitignore	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
images.qrc	Moved integrationtests/* into other/	2011-11-30 09:30:22 +01:00
lancelot.pro	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-08-18 11:07:51 +02:00
paintcommands.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
paintcommands.h	Updated license headers	2016-01-21 18:55:18 +00:00
tst_lancelot.cpp	Updated license headers	2016-01-21 18:55:18 +00:00