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/configure.json | |
parent | dff3843d98d52e2c32fea07371f91117de0667e9 (diff) | |
parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I379794a01cbf6fb39d94b24cc8c90b1971a212b9
Diffstat (limited to 'src/corelib/configure.json')
-rw-r--r-- | src/corelib/configure.json | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 1c3e874c04..5ee7888d4f 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -1100,6 +1100,12 @@ Mozilla License) is included. The data is then also used in QNetworkCookieJar::v Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation.", "section": "Utilities", "output": [ "publicFeature" ] + }, + "binaryjson": { + "label": "Binary JSON (deprecated)", + "purpose": "Provides support for the deprecated binary JSON format.", + "section": "Utilities", + "output": [ "publicFeature" ] } }, |