Lars Knoll 26237f0a2d Fix QJsonValue::fromVariant() if the variant contains a json object ... If the variant contains a known json type (value, array, object or document), simply unwrap those. In the case of the json document wrap the contained object/array into a QJsonValue. This should be the expected behavior, and makes more sense than returning a null QJsonValue. Task-number: QTBUG-41234 Change-Id: Id084fc11220d51aaf78b7694fd0ebef1411f5c51 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>		2015-12-22 10:00:46 +00:00
..
animation	Extend tst_QPauseAnimation::pauseAndPropertyAnimations blacklist	2015-06-20 15:25:58 +00:00
codecs	fix usage of wince scope	2015-06-05 10:29:10 +00:00
global	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
io	QUrl: revert path-normalization in setPath().	2015-12-22 09:56:27 +00:00
itemmodels	tst_QItemModel: Use a QTemporaryDir for test data of QDirModel.	2015-11-27 22:50:26 +00:00
json	Fix QJsonValue::fromVariant() if the variant contains a json object	2015-12-22 10:00:46 +00:00
kernel	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
mimetypes	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-10-02 16:59:55 +02:00
plugin	Autotest: remove AIX-related QT_POINTER_SIZE code	2015-10-23 18:10:22 +00:00
statemachine	Add a test case for conflicting transitions	2015-10-30 21:15:38 +00:00
thread	Fix compilation for WinRT	2015-12-14 08:43:15 +00:00
tools	Stabilize tst_qtimeline::resume	2015-12-21 08:53:21 +00:00
xml	Update copyright headers	2015-02-11 06:49:51 +00:00
corelib.pro	iOS: Enable building of basic tests	2014-01-22 12:35:17 +01:00