whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,572 Commits
1 Branch
0 Tags
407 MiB
Commit Graph

10 Commits (56e5e06ff2f3a2230bb7780c73c85b73f9aaa4f8)

Author SHA1 Message Date
Mat Sutcliffe 7f8e3aab2d JSON: add some QStringView overloads 
[ChangeLog][QtCore][JSON] Added overloads of functions taking key
strings as QStringView; in QJsonObject, QJsonValue and QJsonDocument.

Change-Id: I78b40aba8200003acfae257ff06f5f15737005e7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
 2019-07-20 12:04:31 +01:00
Allan Sandfeld Jensen b4ead57250 Move away from using 0 as a pointer constant 
Cleans up most of corelib to use nullptr or default enums
where appropriate.

Change-Id: Ifcaac14ecdaaee730f87f10941db3ce407d71ef9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2019-06-07 17:19:16 +02:00
Jędrzej Nowacki 0e84e3866c Implement QJsonValue data stream operator 
Change-Id: I9cff40828ab68b4e2474da506b2da2cfed479f2c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Luca Beldi <v.ronin@yahoo.it>
 2018-10-03 14:49:17 +00:00
Ulf Hermann 231273b130 JSON: Add qHash functions for JSON and CBOR types 
This way we can easily use them as keys in QHash and QSet.

Change-Id: Ie744c3b5ad1176ba2ab035c7e650af483757a0c9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2018-08-27 13:06:19 +00:00
Edward Welbourne 23c9d4c98f Merge branch '5.11' into dev 
Conflicts:
	qmake/library/qmakebuiltins.cpp
	src/plugins/platforms/windows/qwindowstabletsupport.h
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/widgets/styles/qstylesheetstyle.cpp
	tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp

Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
 2018-07-31 13:33:14 +02:00
Paul Wicking 603fbd06fb Doc: Add since version for QJson method and enum 
QJsonValue::toInt() introduced in 5.2, 7372c6cf9d4
QJsonDocument::JsonFormat introduced in 5.1, 4bb5566632

Task-number: QTBUG-69527
Change-Id: Idb9df959f82fe7061e0afe2109f1ca34a4451a5f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2018-07-19 13:05:14 +00:00
Thiago Macieira fcb0f68e77 CBOR: Complete the conversions between CBOR, JSON and Qt meta types 
Change-Id: I56b444f9d6274221a3b7fffd150d3130db6ef1a0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 2018-07-04 03:04:17 +00:00
Thiago Macieira 4e02c8d5b8 JSON: remove braces from UUID text representations 
[ChangeLog][QtCore][QJsonValue] fromVariant() conversion now converts
from QUrl and QUuid using special encoding forms to ensure best JSON
compatibility.

Change-Id: I56b444f9d6274221a3b7fffd150cdc5ca1f87ff1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-03-02 04:06:33 +00:00
Thiago Macieira a2ffb35ac2 QJsonValue: use the fully-encoded form of a URL in fromVariant() 
For compatibility with other parsers that may expect it to be so.

Change-Id: I56b444f9d6274221a3b7fffd150cd66390f98fd5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2018-03-02 04:06:24 +00:00
Thiago Macieira a6b697ca13 Create corelib/serialization and move existing file formats into it 
This is in preparation to adding CBOR support. We don't need yet another
dir for CBOR and placing it in src/corelib/json is just wrong.

Change-Id: I9741f017961b410c910dfffd14ffb9d870340fa6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2018-01-26 20:59:50 +00:00