diff options
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qcompilerdetection.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qendian.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qflags.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnumeric_p.h | 4 | ||||
| -rw-r--r-- | src/corelib/global/qtversionchecks.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 35d0c5816b..3cb6669042 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1040,7 +1040,7 @@ * "Weak overloads" - makes an otherwise confliciting overload weaker * (by making it a template) */ -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC # define Q_WEAK_OVERLOAD template <typename = void> #else # define Q_WEAK_OVERLOAD @@ -1064,7 +1064,7 @@ * The workaround: declare such functions as function templates. * (Obviously a function template does not need this marker.) */ -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC # define QT_POST_CXX17_API_IN_EXPORTED_CLASS template <typename = void> #else # define QT_POST_CXX17_API_IN_EXPORTED_CLASS diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index b803a27674..9cd0044cbc 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -302,7 +302,7 @@ public: static constexpr T fromSpecial(T source) { return qFromBigEndian(source); } }; -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename T> class QLEInteger { public: diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index c791c26ac1..26a8e5c9cf 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -24,7 +24,7 @@ public: // Microsoft Visual Studio has buggy behavior when it comes to // unsigned enums: even if the enum is unsigned, the enum tags are // always signed -# if !defined(__LP64__) && !defined(Q_CLANG_QDOC) +# if !defined(__LP64__) && !defined(Q_QDOC) constexpr inline Q_IMPLICIT QFlag(long value) noexcept : i(int(value)) {} constexpr inline Q_IMPLICIT QFlag(ulong value) noexcept : i(int(long(value))) {} # endif @@ -57,7 +57,7 @@ class QFlags static_assert((std::is_enum<Enum>::value), "QFlags is only usable on enumeration types."); public: -#if defined(Q_CC_MSVC) || defined(Q_CLANG_QDOC) +#if defined(Q_CC_MSVC) || defined(Q_QDOC) // see above for MSVC // the definition below is too complex for qdoc typedef int Int; diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index f5beb4d38d..9765ce4a31 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -138,7 +138,7 @@ Q_DECL_CONST_FUNCTION static inline int qt_fpclassify(float f) return qnumeric_std_wrapper::fpclassify(f); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC namespace { /*! Returns true if the double \a v can be converted to type \c T, false if @@ -312,7 +312,7 @@ template <auto V2, typename T> bool mul_overflow(T v1, T *r) return qMulOverflow<V2, T>(v1, r); } } -#endif // Q_CLANG_QDOC +#endif // Q_QDOC /* Safely narrows \a x to \c{To}. Let \c L be diff --git a/src/corelib/global/qtversionchecks.h b/src/corelib/global/qtversionchecks.h index 8f3bd8b371..d3b7a7b082 100644 --- a/src/corelib/global/qtversionchecks.h +++ b/src/corelib/global/qtversionchecks.h @@ -64,7 +64,7 @@ int size() const { return int(size(QT6_CALL_NEW_OVERLOAD)); } */ -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC # define QT6_DECL_NEW_OVERLOAD # define QT6_DECL_NEW_OVERLOAD_TAIL # define QT6_IMPL_NEW_OVERLOAD |