whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/json
History
Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 
Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
 		2015-02-24 21:02:08 +01:00
..
bom.json Correctly parse json documents with a leading BOM 2012-05-10 13:50:35 +02:00
json.pro Android: Fix json test. 2014-12-22 08:32:39 +01:00
json.qrc Android: Fix json test. 2014-12-22 08:32:39 +01:00
test.bjson Fix parsing of unicode escape sequences 2012-03-07 00:03:07 +01:00
test.json Import json support from playground/qtbinaryjson 2012-01-24 15:28:20 +01:00
test2.json Import json support from playground/qtbinaryjson 2012-01-24 15:28:20 +01:00
test3.json Add the missing test file and give it a proper name. 2012-01-30 18:48:28 +01:00
tst_qtjson.cpp Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00