qt/qtbase.git - Qt Base (Core, Gui, Widgets, Network, ...)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Limit the nesting depth of the Json parser	Lars Knoll	2012-05-16	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The parser is recursive and too deeply nested json would cause it to exhaust the available stack space leading to crashes. We now abort parsing with a DeepNesting parse error if the document is too deeply nested. The current nesting limit is set to 1024, which should be more then enough for any real JSON data set. Change-Id: I4adea3fd727149f7342536d73cf4530361a0a3a1 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
*	QJsonParseError improvements	Alexei Rousskikh	2012-03-27	1	-4/+6
\| \| \| \| \| \| \| \|	- added human-readable error message - improved enum value names Change-Id: I86d4bb419f9581f85d61b6e090048f1943017f9e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Trailing comma should result in an error during JSON parsing	Alexei Rousskikh	2012-03-12	1	-1/+2
\| \| \| \| \| \| \| \| \|	1. QJsonParseError::MissingObject defined 2. QJsonDocument::fromJson() will result in defined error after parsing of something like "{ 'key':1 , }" or "[ {'key':1}, ]" Change-Id: I8e6234a03b8aca4e5ad6180f273f91066b86d7a1 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Added error reporting to QJsonParser	Andrew Christian	2012-02-18	1	-1/+21
\| \| \| \| \|	Change-Id: Ib2390c0faf1ed7ada3fc185abce83740ad112929 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Update contact address in license headers.	Jason McDonald	2012-01-31	1	-1/+1
\| \| \| \| \|	Change-Id: I35bf916087511f26bfeb49ceb3256d9a20fbc1c0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Remove "All rights reserved" line from license headers.	Jason McDonald	2012-01-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \|	As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: I311e001373776812699d6efc045b5f742890c689 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
*	Fixed includes in public headers	Denis Dzyubenko	2012-01-27	1	-1/+1
\| \| \| \| \|	Change-Id: I360c94d41691a618f1bec97da8317c9dcee658c0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
*	Import json support from playground/qtbinaryjson	Lars Knoll	2012-01-24	1	-0/+125
	This imports the JSON support for Qt 5 from playground/qtbinaryjson. It adds a fast, fully compliant json parser, a convenient C++ API, conversion to and from QVariants and a binary format for JSON that is extremely fast to use together with the C++ API. Change-Id: If9e3a21a4241d388d0abaa446b6824f9cc6edb1c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>