Liang Qi 9808b53fde Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure src/plugins/platforms/eglfs/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp Change-Id: Id2da7c775439adb62646d5b741ee7c638042b34b		2016-11-15 09:58:16 +01:00
..
invalidBinaryData	Improve the validation algorithm for binary JSON	2016-11-11 12:34:27 +00:00
bom.json	…
json.pro	Update testdata	2016-02-17 04:50:50 +00:00
json.qrc	Android: Fix json test.	2014-12-22 08:32:39 +01:00
test.bjson	Sanitize JSON test data	2015-12-16 08:54:57 +00:00
test.json	Sanitize JSON test data	2015-12-16 08:54:57 +00:00
test2.json	…
test3.json	…
tst_qtjson.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00