diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
| commit | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (patch) | |
| tree | 726ee71fc1be50cdda04cdc88a1447599f9d74ae /src/corelib/serialization/serialization.pri | |
| parent | dff3843d98d52e2c32fea07371f91117de0667e9 (diff) | |
| parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I379794a01cbf6fb39d94b24cc8c90b1971a212b9
Diffstat (limited to 'src/corelib/serialization/serialization.pri')
| -rw-r--r-- | src/corelib/serialization/serialization.pri | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/corelib/serialization/serialization.pri b/src/corelib/serialization/serialization.pri index 5310fddd67..7407e20d9e 100644 --- a/src/corelib/serialization/serialization.pri +++ b/src/corelib/serialization/serialization.pri @@ -25,7 +25,6 @@ SOURCES += \ serialization/qcbordiagnostic.cpp \ serialization/qcborvalue.cpp \ serialization/qdatastream.cpp \ - serialization/qjson.cpp \ serialization/qjsoncbor.cpp \ serialization/qjsondocument.cpp \ serialization/qjsonobject.cpp \ @@ -45,6 +44,20 @@ qtConfig(cborstream): { serialization/qcborstream.h } +qtConfig(binaryjson): { + HEADERS += \ + serialization/qbinaryjson_p.h \ + serialization/qbinaryjsonarray_p.h \ + serialization/qbinaryjsonobject_p.h \ + serialization/qbinaryjsonvalue_p.h + + SOURCES += \ + serialization/qbinaryjson.cpp \ + serialization/qbinaryjsonarray.cpp \ + serialization/qbinaryjsonobject.cpp \ + serialization/qbinaryjsonvalue.cpp \ +} + false: SOURCES += \ serialization/qcborarray.cpp \ serialization/qcbormap.cpp |