diff options
| author | JiDe Zhang <zhangjide@uniontech.com> | 2021-05-20 16:15:00 +0800 |
|---|---|---|
| committer | JiDe Zhang <zhangjide@uniontech.com> | 2021-05-21 21:37:32 +0800 |
| commit | b254855aa6771c48a6015271880c690f8faeb235 (patch) | |
| tree | 80f99b14f081247588eaeccfdd6950a2d9c12110 /src | |
| parent | bf22f914410b37031acdf39ea8fef89cbbf2ca28 (diff) | |
Use __has_* instead QT_HAS_*
Use __has_include instead QT_HAS_INCLUDE
Use __has_feature instead QT_HAS_FEATURE
Change-Id: If9b0af1f4386f7bcae6ca2fb911ffaba422750dd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qdeadlinetimer.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qstring.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qduplicatetracker_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qdeadlinetimer.h b/src/corelib/kernel/qdeadlinetimer.h index 8ec9380916..08e80e448c 100644 --- a/src/corelib/kernel/qdeadlinetimer.h +++ b/src/corelib/kernel/qdeadlinetimer.h @@ -192,7 +192,7 @@ public: QPair<qint64, unsigned> _q_data() const { return qMakePair(t1, t2); } }; -#if QT_HAS_INCLUDE(<chrono>) && (defined(Q_OS_DARWIN) || defined(Q_OS_LINUX) || (defined(Q_CC_MSVC) && Q_CC_MSVC >= 1900)) +#if __has_include(<chrono>) && (defined(Q_OS_DARWIN) || defined(Q_OS_LINUX) || (defined(Q_CC_MSVC) && Q_CC_MSVC >= 1900)) // We know for these OS/compilers that the std::chrono::steady_clock uses the same // reference time as QDeadlineTimer diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp index 5219b9e9b2..dc611db9e0 100644 --- a/src/corelib/text/qstring.cpp +++ b/src/corelib/text/qstring.cpp @@ -171,7 +171,7 @@ qsizetype QtPrivate::qustrlen(const char16_t *str) noexcept { qsizetype result = 0; -#if defined(__SSE2__) && !(defined(__SANITIZE_ADDRESS__) || QT_HAS_FEATURE(address_sanitizer)) +#if defined(__SSE2__) && !(defined(__SANITIZE_ADDRESS__) || __has_feature(address_sanitizer)) // find the 16-byte alignment immediately prior or equal to str quintptr misalignment = quintptr(str) & 0xf; Q_ASSERT((misalignment & 1) == 0); diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h index b457d9e499..c7c63e1000 100644 --- a/src/corelib/tools/qduplicatetracker_p.h +++ b/src/corelib/tools/qduplicatetracker_p.h @@ -52,7 +52,7 @@ #include <qglobal.h> -#if QT_HAS_INCLUDE(<memory_resource>) && __cplusplus > 201402L +#if __has_include(<memory_resource>) && __cplusplus > 201402L # include <unordered_set> # include <memory_resource> # include <qhash.h> // for the hashing helpers diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 46917cfbe9..39f5ded796 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -389,7 +389,7 @@ static uint siphash(const uint8_t *in, uint inlen, const uint seed) #if defined(__SANITIZE_ADDRESS__) || defined(__SANITIZE_THREAD__) // GCC # define QHASH_AES_SANITIZER_BUILD -#elif QT_HAS_FEATURE(address_sanitizer) || QT_HAS_FEATURE(thread_sanitizer) // Clang +#elif __has_feature(address_sanitizer) || __has_feature(thread_sanitizer) // Clang # define QHASH_AES_SANITIZER_BUILD #endif |