diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-20 09:25:19 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-11-25 14:53:27 +0000 |
| commit | 1c655fb0fc08e89ab5efb23889266b710334f1a5 (patch) | |
| tree | ad0eae64bab5ffb902bf63bc88a98fed5cd1d83b /src/corelib/configure.cmake | |
| parent | bc1cae774ad8cc084a98cb37d363770efbde025c (diff) | |
Post merge fixes
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
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, 11 insertions, 0 deletions
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake index 8e4cbcd596..260ee88014 100644 --- a/src/corelib/configure.cmake +++ b/src/corelib/configure.cmake @@ -682,6 +682,12 @@ qt_feature("sharedmemory" PUBLIC CONDITION ( ANDROID OR WIN32 OR ( NOT VXWORKS AND ( TEST_ipc_sysv OR TEST_ipc_posix ) ) ) ) qt_feature_definition("sharedmemory" "QT_NO_SHAREDMEMORY" NEGATE VALUE "1") +qt_feature("shortcut" PUBLIC + SECTION "Kernel" + LABEL "QShortcut" + PURPOSE "Provides keyboard accelerators and shortcuts." +) +qt_feature_definition("shortcut" "QT_NO_SHORTCUT" NEGATE VALUE "1") qt_feature("systemsemaphore" PUBLIC SECTION "Kernel" LABEL "QSystemSemaphore" @@ -934,3 +940,8 @@ qt_feature("cborstream" PUBLIC 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." ) +qt_feature("binaryjson" PUBLIC + SECTION "Utilities" + LABEL "Binary JSON (deprecated)" + PURPOSE "Provides support for the deprecated binary JSON format." +) |