diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-12-10 13:51:40 +0200 |
| commit | 90210d5d9c4029057035019f144212922494ff0a (patch) | |
| tree | 1aacefa57786964d47a200791280ae91c9b825da /src/corelib/global/qconfig-bootstrapped.h | |
| parent | c69a2448ab129d88411a4778f2350dcf971dc623 (diff) | |
| parent | 5231c26a82a7056f98d99643850754d4e1ebe417 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/auto/network/kernel/qnetworkinterface/BLACKLIST
Change-Id: I1e8866c63b54bcd95fc2a044276ee15b7f60e79a
Diffstat (limited to 'src/corelib/global/qconfig-bootstrapped.h')
| -rw-r--r-- | src/corelib/global/qconfig-bootstrapped.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index 81bf6f95ce..b62c1a4d35 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -77,13 +77,13 @@ #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) +#define QT_FEATURE_cxx11_random (__has_include(<random>) ? 1 : -1) #define QT_NO_DATASTREAM #define QT_FEATURE_datestring 1 #define QT_FEATURE_datetimeparser -1 #define QT_FEATURE_easingcurve -1 #define QT_FEATURE_etw -1 -#define QT_FEATURE_getauxval (QT_HAS_INCLUDE(<sys/auxv.h>) ? 1 : -1) +#define QT_FEATURE_getauxval (__has_include(<sys/auxv.h>) ? 1 : -1) #define QT_FEATURE_getentropy -1 #define QT_NO_GEOM_VARIANT #define QT_FEATURE_hijricalendar -1 |