diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:10 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-04 14:03:11 +0200 |
| commit | 464a43d43c2bb2440d4ad745bc134e0dac10872c (patch) | |
| tree | b1c27b1d1c11f9c43bd2e62e1fd955bc6f89029f /src/corelib/global/qconfig-bootstrapped.h | |
| parent | 0208cac94fbd79fc563c903e2b973d79f9644b82 (diff) | |
| parent | 877ef0594d94f48bf063446b1f8a4b5e1941a8cd (diff) | |
Merge 5.9 into 5.9.0v5.9.0-beta4
Change-Id: Id3fc911f024cba292a5c426b36aa94ff9f3c0ef7
Diffstat (limited to 'src/corelib/global/qconfig-bootstrapped.h')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index bda8ad7916..0b02ecc8ec 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -68,6 +68,13 @@ #define QT_CRYPTOGRAPHICHASH_ONLY_SHA1 #define QT_NO_DATASTREAM +#define QT_FEATURE_alloca 1 +#define QT_FEATURE_alloca_h -1 +#ifdef _WIN32 +# define QT_FEATURE_alloca_malloc_h 1 +#else +# define QT_FEATURE_alloca_malloc_h -1 +#endif #define QT_FEATURE_iconv -1 #define QT_FEATURE_icu -1 #define QT_FEATURE_journald -1 |