whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/corelib/json
History
Liang Qi bce25a6340 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	src/gui/painting/qcoregraphics.mm
	src/gui/painting/qcoregraphics_p.h
	src/plugins/platforms/cocoa/qcocoahelpers.h
	src/plugins/platforms/cocoa/qcocoahelpers.mm

Change-Id: Ibe5efcae73526b3d3931ed22730b13d372dcf54e
 		2016-11-25 14:41:29 +01:00
..
json.pri Import json support from playground/qtbinaryjson 2012-01-24 15:28:20 +01:00
qjson.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
qjson_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-16 12:35:36 +01:00
qjsonarray.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qjsonarray.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-18 20:50:35 +01:00
qjsondocument.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qjsondocument.h Updated license headers 2016-01-15 12:25:24 +00:00
qjsonobject.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
qjsonobject.h QJsonObject: add some overloads taking QLatin1String 2016-05-10 21:18:46 +00:00
qjsonparser.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-25 14:41:29 +01:00
qjsonparser_p.h Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-25 14:41:29 +01:00
qjsonvalue.cpp QVariant to QJsonValue::Null conversion 2016-11-08 09:50:32 +00:00
qjsonvalue.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-18 11:07:51 +02:00
qjsonwriter.cpp Update the Intel copyright year 2016-01-21 22:44:16 +00:00
qjsonwriter_p.h Make sure all private headers in Qt Core include qglobal_p.h 2016-06-25 08:01:04 +00:00