diff options
author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 10:42:05 +0100 |
---|---|---|
committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:29:18 +0000 |
commit | 48c82e90af12da74c713665ddfd7f8d825ae5bdb (patch) | |
tree | 0efa87b0cd1b00c47fce0b566a7a0cbb35fed786 /src/corelib/configure.cmake | |
parent | 502d3d6744913899da87acfda5ebdab42c40329e (diff) |
Post Merge Fixes
Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
-rw-r--r-- | src/corelib/configure.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 4e97964b8c..c316d1b90a 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -942,10 +942,15 @@ qt_feature("win32_system_libs" LABEL "Windows System Libraries" CONDITION WIN32 AND libs.advapi32 AND libs.gdi32 AND libs.kernel32 AND libs.netapi32 AND libs.ole32 AND libs.shell32 AND libs.uuid AND libs.user32 AND libs.winmm AND libs.ws2_32 OR FIXME ) -qt_feature("cborstream" PUBLIC +qt_feature("cborstreamreader" PUBLIC SECTION "Utilities" - 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." + 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." +) +qt_feature("cborstreamwriter" PUBLIC + SECTION "Utilities" + LABEL "CBOR stream writing" + PURPOSE "Provides support for writing the CBOR binary format." ) qt_feature("binaryjson" PUBLIC SECTION "Utilities" |