diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:32 +0200 |
commit | 7b3bdcbfe8a920c4c156e91324eb0b374533d42c (patch) | |
tree | 726ee71fc1be50cdda04cdc88a1447599f9d74ae /src/corelib/global/qconfig-bootstrapped.h | |
parent | dff3843d98d52e2c32fea07371f91117de0667e9 (diff) | |
parent | 9d504e1150e4bd49d34aba5cee938d1fd9f7e80c (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I379794a01cbf6fb39d94b24cc8c90b1971a212b9
Diffstat (limited to 'src/corelib/global/qconfig-bootstrapped.h')
-rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index da3a1a005f..c58dc56c42 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -74,6 +74,7 @@ #else # define QT_FEATURE_alloca_malloc_h -1 #endif +#define QT_FEATURE_binaryjson -1 #define QT_FEATURE_cborstream -1 #define QT_CRYPTOGRAPHICHASH_ONLY_SHA1 #define QT_FEATURE_cxx11_random (QT_HAS_INCLUDE(<random>) ? 1 : -1) |