summaryrefslogtreecommitdiffstats
path: root/src/corelib/configure.json
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-10-29 13:50:22 +0100
committerUlf Hermann <ulf.hermann@qt.io>2019-12-12 10:42:27 +0100
commit23d23125068f98f4e6bb1ed3bc9899cefd8cbbf4 (patch)
tree0e3e0b023ba32c8105b4e94100e90d38ed16b96f /src/corelib/configure.json
parentb89f2ebd9543d4cf60821a9c3cc12547d7d2253e (diff)
Split cborstream feature in two
Reading of Cbor streams is substantially more complicated than writing as it requires float16 support. When writing Cbor, we can just choose to always write 32bit floats, even if we could compress the numbers into 16 bits. We need Cbor writing in the bootstrap library, but we cannot easily add float16 support. Furthermore, Cbor reading is required for plugin support, but not Cbor writing. It might make sense for some users to build a custom Qt with Cbor writing disabled. Therefore, provide two features, cborstreamreader and cborstreamwriter, split up the code in cborstream.{h|cpp} into several files, and enable Cbor writing in the bootstrap library. Change-Id: I15450afb0e328a84a22ebca9379cffc4f900a75a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/configure.json')
-rw-r--r--src/corelib/configure.json12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json
index 04643aec33..eb60ad213c 100644
--- a/src/corelib/configure.json
+++ b/src/corelib/configure.json
@@ -1087,14 +1087,20 @@ Mozilla License) is included. The data is then also used in QNetworkCookieJar::v
"label": "Windows System Libraries",
"condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32"
},
- "cborstream": {
- "label": "CBOR stream I/O",
- "purpose": "Provides support for reading and writing the CBOR binary format.
+ "cborstreamreader": {
+ "label": "CBOR stream reading",
+ "purpose": "Provides support for reading the CBOR binary format.
Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation.",
"section": "Utilities",
"output": [ "publicFeature" ]
},
+ "cborstreamwriter": {
+ "label": "CBOR stream writing",
+ "purpose": "Provides support for writing the CBOR binary format.",
+ "section": "Utilities",
+ "output": [ "publicFeature" ]
+ },
"binaryjson": {
"label": "Binary JSON (deprecated)",
"purpose": "Provides support for the deprecated binary JSON format.",