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/Makefile.win32 | |
| 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/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 7324817af2..74fb80e337 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -118,7 +118,8 @@ QTOBJS= \ qxmlutils.obj \ qnumeric.obj \ qlogging.obj \ - qjson.obj \ + qcborvalue.obj \ + qjsoncbor.obj \ qjsondocument.obj \ qjsonparser.obj \ qjsonarray.obj \ |