diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2019-06-19 13:43:00 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-10-21 19:12:51 +0200 |
commit | 35adb74ddd915831789f0175423660f8e898942e (patch) | |
tree | 3ac0fd8be75f0b7e0391149d13aab51a7f02dd3f /qmake/qmake.pro | |
parent | 559b563d711db0760a51b0dce26536dbc8766a9d (diff) |
Reimplement JSON support on top of Cbor
In turn, deprecate the QJsonDocument methods that deal with JSON binary
data. You should use CBOR for data serialization these days.
[ChangeLog][Deprecation Notice] The binary JSON representation is
deprecated. The CBOR format should be used instead.
Fixes: QTBUG-47629
Change-Id: Ic8b92ea36de87815b12307a9d8b1095f07166db8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'qmake/qmake.pro')
-rw-r--r-- | qmake/qmake.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qmake/qmake.pro b/qmake/qmake.pro index a9d8b58da8..42c727b33e 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -116,6 +116,7 @@ SOURCES += \ qbytearray.cpp \ qbytearraymatcher.cpp \ qcalendar.cpp \ + qcborvalue.cpp \ qcryptographichash.cpp \ qdatetime.cpp \ qdir.cpp \ @@ -131,8 +132,8 @@ SOURCES += \ qgregoriancalendar.cpp \ qhash.cpp \ qiodevice.cpp \ - qjson.cpp \ qjsonarray.cpp \ + qjsoncbor.cpp \ qjsondocument.cpp \ qjsonobject.cpp \ qjsonparser.cpp \ @@ -174,6 +175,8 @@ HEADERS += \ qcalendar.h \ qcalendarbackend_p.h \ qcalendarmath_p.h \ + qcborvalue.h \ + qcborvalue_p.h \ qchar.h \ qcryptographichash.h \ qdatetime.h \ |