diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:33:51 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:33:51 +0200 |
| commit | b2054433516f7161906d45de0971bbc032576ded (patch) | |
| tree | 41622e555a036fa86ac9a585a016e148eaa7f40c /src/corelib/global/qconfig-bootstrapped.h | |
| parent | c1e4c7d7639b84c0220e3a2ddd455d03c0910893 (diff) | |
| parent | ebec918722a283410624af6df38345b9dfc0b8f8 (diff) | |
Merge remote-tracking branch 'origin/5.14' into dev
Change-Id: Icb486cf8f31ec85d940b2179e8d023fbbc7fd3fa
Diffstat (limited to 'src/corelib/global/qconfig-bootstrapped.h')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index ce3b672637..2e58dabf5f 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -84,8 +84,11 @@ #define QT_FEATURE_getauxval (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1) #define QT_FEATURE_getentropy -1 #define QT_NO_GEOM_VARIANT +#define QT_FEATURE_hijricalendar -1 #define QT_FEATURE_iconv -1 #define QT_FEATURE_icu -1 +#define QT_FEATURE_islamiccivilcalendar -1 +#define QT_FEATURE_jalalicalendar -1 #define QT_FEATURE_journald -1 #define QT_FEATURE_futimens -1 #define QT_FEATURE_futimes -1 |