AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
bd6838d54d
qt5base-lts/tests/auto/corelib/json
History
Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	mkspecs/common/linux-android.conf
	src/gui/opengl/qopengl.h
	src/network/socket/qnativesocketengine_winrt.cpp
	src/network/socket/qnativesocketengine_winrt_p.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	sync.profile

Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
2016-11-16 12:35:36 +01:00
..
invalidBinaryData Improve the validation algorithm for binary JSON 2016-11-11 12:34:27 +00:00
bom.json
json.pro Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00
json.qrc Android: Fix json test. 2014-12-22 08:32:39 +01:00
test2.json
test3.json
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
tst_qtjson.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00