summaryrefslogtreecommitdiffstats
path: root/src/corelib/text
diff options
context:
space:
mode:
authorJiDe Zhang <zhangjide@uniontech.com>2021-05-20 16:15:00 +0800
committerJiDe Zhang <zhangjide@uniontech.com>2021-05-21 21:37:32 +0800
commitb254855aa6771c48a6015271880c690f8faeb235 (patch)
tree80f99b14f081247588eaeccfdd6950a2d9c12110 /src/corelib/text
parentbf22f914410b37031acdf39ea8fef89cbbf2ca28 (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/corelib/text')
-rw-r--r--src/corelib/text/qstring.cpp2
1 files changed, 1 insertions, 1 deletions
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);