diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-17 01:01:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-17 01:01:01 +0200 |
| commit | 6f27bb135246b7fe9d11ba58e05d2b7661bc2080 (patch) | |
| tree | 9704e1c4ffb775472a9984872c3bd292faa999a5 /src/corelib/configure.json | |
| parent | dc4212b3a694e143595968419ae5ad695ab2aa03 (diff) | |
| parent | c222a9283d94ad1e29334bb2fba0beef7cc716c7 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ica69de99be9c8af4d28a52e4b69e6af748ed983c
Diffstat (limited to 'src/corelib/configure.json')
| -rw-r--r-- | src/corelib/configure.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/configure.json b/src/corelib/configure.json index ae360239c6..b4b7c4eec3 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -1086,6 +1086,14 @@ Mozilla License) is included. The data is then also used in QNetworkCookieJar::v "win32_system_libs": { "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. + +Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation.", + "section": "Utilities", + "output": [ "publicFeature" ] } }, |