diff options
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qbytearrayalgorithms.h | 2 | ||||
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qhash.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qoffsetstringarray_p.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qtexthtmlparser.cpp | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index b3479de309..f7989da8be 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1353,7 +1353,7 @@ #endif #endif #ifndef Q_FALLTHROUGH -# if (defined(Q_CC_GNU) && Q_CC_GNU >= 700) && !defined(Q_CC_INTEL) +# if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 700 # define Q_FALLTHROUGH() __attribute__((fallthrough)) # else # define Q_FALLTHROUGH() (void)0 diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 5de3c780c3..82a33939dc 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1189,7 +1189,7 @@ constexpr std::underlying_type_t<Enum> qToUnderlying(Enum e) noexcept # endif #elif defined(__has_cpp_attribute) && __has_cpp_attribute(clang::require_constant_initialization) # define Q_CONSTINIT [[clang::require_constant_initialization]] -#elif defined(Q_CC_GNU) && Q_CC_GNU >= 1000 +#elif defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1000 # define Q_CONSTINIT __constinit #else # define Q_CONSTINIT diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 8b52752470..58bbb5f813 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -2204,7 +2204,7 @@ constexpr auto typenameHelper() constexpr int suffix = sizeof("]"); #endif -#if (defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) && Q_CC_GNU < 804) +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU_ONLY < 804 auto func = Q_FUNC_INFO; const char *begin = func + prefix; const char *end = func + sizeof(Q_FUNC_INFO) - suffix; diff --git a/src/corelib/text/qbytearrayalgorithms.h b/src/corelib/text/qbytearrayalgorithms.h index 164868fa91..ae48215850 100644 --- a/src/corelib/text/qbytearrayalgorithms.h +++ b/src/corelib/text/qbytearrayalgorithms.h @@ -134,7 +134,7 @@ Q_CORE_EXPORT char *qstrdup(const char *); inline size_t qstrlen(const char *str) { QT_WARNING_PUSH -#if defined(Q_CC_GNU) && Q_CC_GNU >= 900 && Q_CC_GNU < 1000 +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 900 && Q_CC_GNU < 1000 // spurious compiler warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91490#c6) // when Q_DECLARE_METATYPE_TEMPLATE_1ARG is used QT_WARNING_DISABLE_GCC("-Wstringop-overflow") diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 47848fa80c..faf9fd8c82 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -40,7 +40,7 @@ #include "qglobal.h" -#if (defined(QT_STATIC) || defined(QT_BOOTSTRAPPED)) && defined(Q_CC_GNU) && Q_CC_GNU >= 1000 +#if (defined(QT_STATIC) || defined(QT_BOOTSTRAPPED)) && defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1000 QT_WARNING_DISABLE_GCC("-Wfree-nonheap-object") // false positive tracking #endif diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 24e710c2e5..8c1c3a8d13 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -382,7 +382,7 @@ static uint64_t siphash(const uint8_t *in, uint64_t inlen, uint64_t seed, uint64 } -#if defined(Q_CC_GNU) && Q_CC_GNU >= 700 +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 700 QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough") #endif switch (left) { @@ -486,7 +486,7 @@ static uint siphash(const uint8_t *in, uint inlen, uint seed, uint seed2) v0 ^= m; } -#if defined(Q_CC_GNU) && Q_CC_GNU >= 700 +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 700 QT_WARNING_DISABLE_GCC("-Wimplicit-fallthrough") #endif switch (left) { diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h index 3e4abf4bb5..6287edf761 100644 --- a/src/corelib/tools/qoffsetstringarray_p.h +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -66,7 +66,7 @@ class tst_QOffsetStringArray; QT_BEGIN_NAMESPACE QT_WARNING_PUSH -#if defined(Q_CC_GNU) && Q_CC_GNU >= 1100 +#if defined(Q_CC_GNU_ONLY) && Q_CC_GNU >= 1100 // we usually don't overread, but GCC has a false positive QT_WARNING_DISABLE_GCC("-Wstringop-overread") #endif diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index 7f5cde8fe3..aef5e34d7b 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -323,7 +323,7 @@ static const struct QTextHtmlEntity { const char name[9]; char16_t code; } entit }; static_assert(MAX_ENTITY == sizeof entities / sizeof *entities); -#if defined(Q_CC_MSVC) && _MSC_VER < 1600 +#if defined(Q_CC_MSVC_ONLY) && _MSC_VER < 1600 bool operator<(const QTextHtmlEntity &entity1, const QTextHtmlEntity &entity2) { return QLatin1StringView(entity1.name) < QLatin1StringView(entity2.name); |