diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 10:02:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-17 16:56:23 +0000 |
| commit | 4df389eb4f1ae10284c03023e923ce2164d46753 (patch) | |
| tree | 0bf380793f86b06cc92c3dcb12d858e199c7cd7d /src/corelib/configure.cmake | |
| parent | 02164e0288f714f1ea93afb32548548686773d1d (diff) | |
Re-generate affected cmake files and configure.json after the merge
This also removes the workarounds of commit
b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream"
in the .pro files.
Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/configure.cmake')
| -rw-r--r-- | src/corelib/configure.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 6ca29a8fc9..9730f78962 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -906,3 +906,8 @@ 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 + 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." +) |