diff options
| author | Luca Di Sera <[email protected]> | 2022-10-11 10:26:28 +0200 |
|---|---|---|
| committer | Luca Di Sera <[email protected]> | 2022-10-21 09:48:36 +0200 |
| commit | e2fef733be92e95ff28225196e14ffeb98d61a1f (patch) | |
| tree | 42bc5a06849c48c89a74fc65a494a126e46b1797 | |
| parent | 2b35b89803bc90a3595be5386da905d79d841b73 (diff) | |
Replace usages of Q_CLANG_QDOC with Q_QDOC
To allow the user to customize the C++ code that QDoc sees, so as to be
able to work-around some limitations on QDoc itself, QDoc defines two
symbols: Q_QDOC and Q_CLANG_QDOC, both of which are "true" during an
entire execution of QDoc.
At a certain point in time, QDoc allowed the user the choice between a
custom C++ parser and a Clang based one.
The Q_QDOC symbol would always be defined while the Q_CLANG_QDOC symbol
would be defined only when the Clang based parser was chosen.
In more recent times, QDoc always uses a Clang based parser, such that
both Q_CLANG_QDOC and Q_QDOC are always defined, making them equivalent.
To avoid using different symbols, and the possible confusion and
fragmentation that derives from it, all usages of Q_CLANG_QDOC are now
replaced by the equivalent usages of Q_QDOC.
Change-Id: I5810abb9ad1016a4c5bbea99acd03381b8514b3f
Reviewed-by: Kai Koehne <[email protected]>
129 files changed, 293 insertions, 293 deletions
diff --git a/src/concurrent/qtaskbuilder.h b/src/concurrent/qtaskbuilder.h index 2f4a39b9e9e..95ab8021e74 100644 --- a/src/concurrent/qtaskbuilder.h +++ b/src/concurrent/qtaskbuilder.h @@ -4,13 +4,13 @@ #ifndef QTBASE_QTTASKBUILDER_H #define QTBASE_QTTASKBUILDER_H -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <QtConcurrent/qtconcurrentstoredfunctioncall.h> QT_BEGIN_NAMESPACE -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC namespace QtConcurrent { @@ -126,7 +126,7 @@ private: // Data } // namespace QtConcurrent -#endif // Q_CLANG_QDOC +#endif // Q_QDOC QT_END_NAMESPACE diff --git a/src/concurrent/qtconcurrentfilter.h b/src/concurrent/qtconcurrentfilter.h index 0f014713d99..d9fbc1b019a 100644 --- a/src/concurrent/qtconcurrentfilter.h +++ b/src/concurrent/qtconcurrentfilter.h @@ -10,7 +10,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <QtConcurrent/qtconcurrentfilterkernel.h> #include <QtConcurrent/qtconcurrentfunctionwrappers.h> @@ -71,7 +71,7 @@ QFuture<ResultType> filteredReduced(Sequence &&sequence, std::forward<KeepFunctor>(keep), std::forward<ReduceFunctor>(reduce), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -94,7 +94,7 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -116,7 +116,7 @@ QFuture<ResultType> filteredReduced(Sequence &&sequence, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Sequence, typename KeepFunctor, typename ReduceFunctor, std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0, typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> @@ -213,7 +213,7 @@ QFuture<ResultType> filteredReduced(Iterator begin, std::forward<ReduceFunctor>(reduce), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -236,7 +236,7 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -259,7 +259,7 @@ QFuture<ResultType> filteredReduced(Iterator begin, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Iterator, typename KeepFunctor, typename ReduceFunctor, typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> QFuture<ResultType> filteredReduced(QThreadPool *pool, @@ -406,7 +406,7 @@ ResultType blockingFilteredReduced(Sequence &&sequence, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -430,7 +430,7 @@ ResultType blockingFilteredReduced(QThreadPool *pool, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -453,7 +453,7 @@ ResultType blockingFilteredReduced(Sequence &&sequence, return future.takeResult(); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Sequence, typename KeepFunctor, typename ReduceFunctor, std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0, typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> @@ -557,7 +557,7 @@ ResultType blockingFilteredReduced(Iterator begin, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -581,7 +581,7 @@ ResultType blockingFilteredReduced(QThreadPool *pool, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -604,7 +604,7 @@ ResultType blockingFilteredReduced(Iterator begin, return future.takeResult(); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Iterator, typename KeepFunctor, typename ReduceFunctor, typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> ResultType blockingFilteredReduced(QThreadPool *pool, diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h index b05508d0242..68664c7f520 100644 --- a/src/concurrent/qtconcurrentfilterkernel.h +++ b/src/concurrent/qtconcurrentfilterkernel.h @@ -6,7 +6,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined (Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined (Q_QDOC) #include <QtConcurrent/qtconcurrentiteratekernel.h> #include <QtConcurrent/qtconcurrentmapkernel.h> diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 4882ed8d89c..78900c239bb 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -10,7 +10,7 @@ #include <tuple> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) QT_BEGIN_NAMESPACE diff --git a/src/concurrent/qtconcurrentiteratekernel.cpp b/src/concurrent/qtconcurrentiteratekernel.cpp index b735ae41373..088c8384ced 100644 --- a/src/concurrent/qtconcurrentiteratekernel.cpp +++ b/src/concurrent/qtconcurrentiteratekernel.cpp @@ -7,7 +7,7 @@ #include "private/qfunctions_p.h" -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) QT_BEGIN_NAMESPACE diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 8df873dbad0..a23fe37a3c1 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -6,7 +6,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <QtCore/qatomic.h> #include <QtConcurrent/qtconcurrentmedian.h> diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h index ffdc4c90048..bd959f44d3c 100644 --- a/src/concurrent/qtconcurrentmap.h +++ b/src/concurrent/qtconcurrentmap.h @@ -10,7 +10,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <QtConcurrent/qtconcurrentmapkernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h> @@ -75,7 +75,7 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence, std::forward<MapFunctor>(map), std::forward<ReduceFunctor>(reduce), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -97,7 +97,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool, std::forward<ReduceFunctor>(reduce), ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -148,7 +148,7 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence, std::forward<MapFunctor>(map), std::forward<ReduceFunctor>(reduce), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType, typename InitialValueType> #else @@ -172,7 +172,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType, typename InitialValueType> #else @@ -223,7 +223,7 @@ QFuture<ResultType> mappedReduced(Iterator begin, std::forward<ReduceFunctor>(reduce), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -246,7 +246,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -298,7 +298,7 @@ QFuture<ResultType> mappedReduced(Iterator begin, std::forward<ReduceFunctor>(reduce), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, typename InitialValueType> #else @@ -322,7 +322,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool, ResultType(std::forward<InitialValueType>(initialValue)), options); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, typename InitialValueType> #else @@ -453,7 +453,7 @@ ResultType blockingMappedReduced(Sequence &&sequence, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -477,7 +477,7 @@ ResultType blockingMappedReduced(QThreadPool *pool, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -533,7 +533,7 @@ ResultType blockingMappedReduced(Sequence &&sequence, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType, typename InitialValueType> #else @@ -558,7 +558,7 @@ ResultType blockingMappedReduced(QThreadPool *pool, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType, typename InitialValueType> #else @@ -612,7 +612,7 @@ ResultType blockingMappedReduced(Iterator begin, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -637,7 +637,7 @@ ResultType blockingMappedReduced(QThreadPool *pool, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, typename InitialValueType> #else @@ -692,7 +692,7 @@ ResultType blockingMappedReduced(Iterator begin, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, typename InitialValueType> #else @@ -717,7 +717,7 @@ ResultType blockingMappedReduced(QThreadPool *pool, return future.takeResult(); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, typename InitialValueType> #else diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index 763a8c2d038..61b18e54381 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -6,7 +6,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined (Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined (Q_QDOC) #include <QtConcurrent/qtconcurrentiteratekernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h> diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h index a4896bb72ca..01cb8b93e00 100644 --- a/src/concurrent/qtconcurrentmedian.h +++ b/src/concurrent/qtconcurrentmedian.h @@ -6,7 +6,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <algorithm> #include <cstring> diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h index a2c693d9e2e..cb7d7910aad 100644 --- a/src/concurrent/qtconcurrentreducekernel.h +++ b/src/concurrent/qtconcurrentreducekernel.h @@ -6,7 +6,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <QtCore/qatomic.h> #include <QtCore/qlist.h> @@ -40,7 +40,7 @@ namespace QtConcurrent { MapReduce won't start any new threads, and when it exceeds ReduceQueueThrottleLimit running threads will be stopped. */ -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC enum ReduceQueueLimits { ReduceQueueStartLimit = 20, ReduceQueueThrottleLimit = 30 @@ -70,7 +70,7 @@ enum ReduceOption { // ParallelReduce = 0x8 }; Q_DECLARE_FLAGS(ReduceOptions, ReduceOption) -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions) #endif // supports both ordered and out-of-order reduction diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index e5c7503b68e..cf153ab34e6 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -10,14 +10,14 @@ #include <QtConcurrent/qtconcurrentcompilertest.h> -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) #include <QtConcurrent/qtconcurrentrunbase.h> #include <QtConcurrent/qtconcurrentstoredfunctioncall.h> QT_BEGIN_NAMESPACE -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC typedef int Function; @@ -82,7 +82,7 @@ auto run(Function &&f, Args &&...args) } //namespace QtConcurrent -#endif // Q_CLANG_QDOC +#endif // Q_QDOC QT_END_NAMESPACE diff --git a/src/concurrent/qtconcurrenttask.h b/src/concurrent/qtconcurrenttask.h index ed5109ede1c..40a47918d7c 100644 --- a/src/concurrent/qtconcurrenttask.h +++ b/src/concurrent/qtconcurrenttask.h @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC namespace QtConcurrent { @@ -30,7 +30,7 @@ constexpr auto task(Task &&t) { return QTaskBuilder(std::forward<Task>(t)); } } // namespace QtConcurrent -#endif // Q_CLANG_QDOC +#endif // Q_QDOC QT_END_NAMESPACE diff --git a/src/concurrent/qtconcurrentthreadengine.cpp b/src/concurrent/qtconcurrentthreadengine.cpp index 5c120d676e5..d10cca5de70 100644 --- a/src/concurrent/qtconcurrentthreadengine.cpp +++ b/src/concurrent/qtconcurrentthreadengine.cpp @@ -3,7 +3,7 @@ #include "qtconcurrentthreadengine.h" -#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC) QT_BEGIN_NAMESPACE diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index beca1493037..14e1cf375b9 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -6,7 +6,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#if !defined(QT_NO_CONCURRENT) ||defined(Q_CLANG_QDOC) +#if !defined(QT_NO_CONCURRENT) ||defined(Q_QDOC) #include <QtCore/qthreadpool.h> #include <QtCore/qfuture.h> diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 35d0c5816b4..3cb66690422 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 b803a276743..9cd0044cbc6 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 c791c26ac1f..26a8e5c9cf7 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 f5beb4d38de..9765ce4a319 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 8f3bd8b3713..d3b7a7b0820 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 diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 6c693ad142f..2dc00d8dc35 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -241,7 +241,7 @@ template<typename Container, typename ...T> using QDebugIfHasDebugStreamContainer = std::enable_if_t<std::conjunction_v<QTypeTraits::has_ostream_operator_container<QDebug, Container, T>...>, QDebug>; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template<typename T> inline QDebugIfHasDebugStreamContainer<QList<T>, T> operator<<(QDebug debug, const QList<T> &vec) @@ -380,7 +380,7 @@ QDebug operator<<(QDebug debug, const std::pair<T1, T2> &pair); template <typename T> QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache); -#endif // Q_CLANG_QDOC +#endif // Q_QDOC template <class T> inline QDebug operator<<(QDebug debug, const QSharedPointer<T> &ptr) diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 32bb471af42..7d5e940e846 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -66,7 +66,7 @@ public: QDir(const QString &path = QString()); QDir(const QString &path, const QString &nameFilter, SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QDir(const std::filesystem::path &path); QDir(const std::filesystem::path &path, const QString &nameFilter, SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries); @@ -91,7 +91,7 @@ public: { d_ptr.swap(other.d_ptr); } void setPath(const QString &path); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC void setPath(const std::filesystem::path &path); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -103,7 +103,7 @@ public: QString path() const; QString absolutePath() const; QString canonicalPath() const; -#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(cxx17_filesystem) || defined(Q_QDOC) std::filesystem::path filesystemPath() const { return QtPrivate::toFilesystemPath(path()); } std::filesystem::path filesystemAbsolutePath() const @@ -115,7 +115,7 @@ public: #ifndef QT_BOOTSTRAPPED static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void addSearchPath(const QString &prefix, const QString &path); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC static void addSearchPath(const QString &prefix, const std::filesystem::path &path); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index 53b69dd8b1b..25f63d01c84 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -11,7 +11,7 @@ #if QT_CONFIG(cxx17_filesystem) #include <filesystem> -#elif defined(Q_CLANG_QDOC) +#elif defined(Q_QDOC) namespace std { namespace filesystem { class path { @@ -64,7 +64,7 @@ class Q_CORE_EXPORT QFile : public QFileDevice public: QFile(); QFile(const QString &name); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QFile(const std::filesystem::path &name); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -77,7 +77,7 @@ public: explicit QFile(QObject *parent); QFile(const QString &name, QObject *parent); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QFile(const std::filesystem::path &path, QObject *parent); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -89,12 +89,12 @@ public: ~QFile(); QString fileName() const override; -#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(cxx17_filesystem) || defined(Q_QDOC) std::filesystem::path filesystemFileName() const { return QtPrivate::toFilesystemPath(fileName()); } #endif void setFileName(const QString &name); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC void setFileName(const std::filesystem::path &name); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -136,7 +136,7 @@ public: bool exists() const; static bool exists(const QString &fileName); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC static bool exists(const std::filesystem::path &fileName); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -148,7 +148,7 @@ public: QString symLinkTarget() const; static QString symLinkTarget(const QString &fileName); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC std::filesystem::path filesystemSymLinkTarget() const; static std::filesystem::path filesystemSymLinkTarget(const std::filesystem::path &fileName); #elif QT_CONFIG(cxx17_filesystem) @@ -165,7 +165,7 @@ public: bool remove(); static bool remove(const QString &fileName); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC static bool remove(const std::filesystem::path &fileName); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -177,7 +177,7 @@ public: bool moveToTrash(); static bool moveToTrash(const QString &fileName, QString *pathInTrash = nullptr); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC static bool moveToTrash(const std::filesystem::path &fileName, QString *pathInTrash = nullptr); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -189,7 +189,7 @@ public: bool rename(const QString &newName); static bool rename(const QString &oldName, const QString &newName); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool rename(const std::filesystem::path &newName); static bool rename(const std::filesystem::path &oldName, const std::filesystem::path &newName); @@ -209,7 +209,7 @@ public: bool link(const QString &newName); static bool link(const QString &fileName, const QString &newName); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool link(const std::filesystem::path &newName); static bool link(const std::filesystem::path &fileName, const std::filesystem::path &newName); @@ -229,7 +229,7 @@ public: bool copy(const QString &newName); static bool copy(const QString &fileName, const QString &newName); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool copy(const std::filesystem::path &newName); static bool copy(const std::filesystem::path &fileName, const std::filesystem::path &newName); @@ -261,7 +261,7 @@ public: static Permissions permissions(const QString &filename); bool setPermissions(Permissions permissionSpec) override; static bool setPermissions(const QString &filename, Permissions permissionSpec); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC static Permissions permissions(const std::filesystem::path &filename); static bool setPermissions(const std::filesystem::path &filename, Permissions permissionSpec); #elif QT_CONFIG(cxx17_filesystem) diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index 1cb36495ef3..d0ec231f89b 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -34,7 +34,7 @@ public: QFILEINFO_MAYBE_EXPLICIT QFileInfo(const QFileDevice &file); QFILEINFO_MAYBE_EXPLICIT QFileInfo(const QDir &dir, const QString &file); QFileInfo(const QFileInfo &fileinfo); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QFileInfo(const std::filesystem::path &file); QFileInfo(const QDir &dir, const std::filesystem::path &file); #elif QT_CONFIG(cxx17_filesystem) @@ -63,7 +63,7 @@ public: void setFile(const QString &file); void setFile(const QFileDevice &file); void setFile(const QDir &dir, const QString &file); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC void setFile(const std::filesystem::path &file); #elif QT_CONFIG(cxx17_filesystem) template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> @@ -77,7 +77,7 @@ public: QString filePath() const; QString absoluteFilePath() const; QString canonicalFilePath() const; -#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(cxx17_filesystem) || defined(Q_QDOC) std::filesystem::path filesystemFilePath() const { return QtPrivate::toFilesystemPath(filePath()); } std::filesystem::path filesystemAbsoluteFilePath() const @@ -95,7 +95,7 @@ public: QString path() const; QString absolutePath() const; QString canonicalPath() const; -#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(cxx17_filesystem) || defined(Q_QDOC) std::filesystem::path filesystemPath() const { return QtPrivate::toFilesystemPath(path()); } std::filesystem::path filesystemAbsolutePath() const { return QtPrivate::toFilesystemPath(absolutePath()); } @@ -128,7 +128,7 @@ public: QString symLinkTarget() const; QString junctionTarget() const; -#if QT_CONFIG(cxx17_filesystem) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(cxx17_filesystem) || defined(Q_QDOC) std::filesystem::path filesystemSymLinkTarget() const { return QtPrivate::toFilesystemPath(symLinkTarget()); } diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 1af592d39d6..27994591e65 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1476,7 +1476,7 @@ void QProcess::setStandardOutputProcess(QProcess *destination) dto->stdinChannel.pipeFrom(dfrom); } -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) /*! \since 4.7 diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index dba3710295a..4fa1037b38b 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -12,7 +12,7 @@ QT_REQUIRE_CONFIG(processenvironment); -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) struct _PROCESS_INFORMATION; struct _SECURITY_ATTRIBUTES; struct _STARTUPINFOW; @@ -150,7 +150,7 @@ public: void setStandardErrorFile(const QString &fileName, OpenMode mode = Truncate); void setStandardOutputProcess(QProcess *destination); -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) QString nativeArguments() const; void setNativeArguments(const QString &arguments); struct CreateProcessArguments @@ -169,8 +169,8 @@ public: typedef std::function<void(CreateProcessArguments *)> CreateProcessArgumentModifier; CreateProcessArgumentModifier createProcessArgumentsModifier() const; void setCreateProcessArgumentsModifier(CreateProcessArgumentModifier modifier); -#endif // Q_OS_WIN || Q_CLANG_QDOC -#if defined(Q_OS_UNIX) || defined(Q_CLANG_QDOC) +#endif // Q_OS_WIN || Q_QDOC +#if defined(Q_OS_UNIX) || defined(Q_QDOC) std::function<void(void)> childProcessModifier() const; void setChildProcessModifier(const std::function<void(void)> &modifier); #endif diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 5d2c3307284..86b55ea2413 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -49,7 +49,7 @@ public: NativeFormat, IniFormat, -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) Registry32Format, Registry64Format, #endif diff --git a/src/corelib/kernel/qcoreapplication_platform.h b/src/corelib/kernel/qcoreapplication_platform.h index fe0fee915b9..5a2543146a3 100644 --- a/src/corelib/kernel/qcoreapplication_platform.h +++ b/src/corelib/kernel/qcoreapplication_platform.h @@ -17,13 +17,13 @@ #include <QtCore/qnativeinterface.h> #include <QtCore/qcoreapplication.h> -#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) #include <QtCore/qjnitypes.h> #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) #include <QtCore/qfuture.h> #include <QtCore/qvariant.h> #endif -#endif // #if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#endif // #if defined(Q_OS_ANDROID) || defined(Q_QDOC) #if defined(Q_OS_ANDROID) class _jobject; @@ -38,11 +38,11 @@ Q_DECLARE_JNI_TYPE(Context, "Landroid/content/Context;") namespace QNativeInterface { -#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) struct Q_CORE_EXPORT QAndroidApplication { QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication) -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC static jobject context(); #else static QtJniTypes::Context context(); diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 81cd30203a9..b92c808c285 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -136,7 +136,7 @@ public: #endif template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -150,7 +150,7 @@ public: } template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -161,7 +161,7 @@ public: } template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -172,7 +172,7 @@ public: } template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -183,7 +183,7 @@ public: } template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -196,7 +196,7 @@ public: } template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index f6eb4536a49..c6752205e2f 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -310,7 +310,7 @@ To convertImplicit(const From& from) class Q_CORE_EXPORT QMetaType { public: -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC // The code that actually gets compiled. enum Type { // these are merged with QVariant @@ -719,7 +719,7 @@ public: static bool hasRegisteredMutableViewFunction(QMetaType fromType, QMetaType toType); -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template<typename, bool> friend struct QtPrivate::SequentialValueTypeIsMetaType; template<typename, bool> friend struct QtPrivate::AssociativeValueTypeIsMetaType; template<typename, bool> friend struct QtPrivate::IsMetaTypePair; diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index 358f1514955..075529571f7 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -101,7 +101,7 @@ public: virtual bool event(QEvent *event); virtual bool eventFilter(QObject *watched, QEvent *event); -#if defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) +#if defined(QT_NO_TRANSLATION) || defined(Q_QDOC) static QString tr(const char *sourceText, const char * = nullptr, int = -1) { return QString::fromUtf8(sourceText); } #endif // QT_NO_TRANSLATION @@ -188,7 +188,7 @@ public: inline QMetaObject::Connection connect(const QObject *sender, const char *signal, const char *member, Qt::ConnectionType type = Qt::AutoConnection) const; -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename PointerToMemberFunction> static QMetaObject::Connection connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type = Qt::AutoConnection); template<typename PointerToMemberFunction, typename Functor> @@ -311,7 +311,7 @@ public: typename SignalType::ReturnType>(std::move(slot)), type, types, &SignalType::Object::staticMetaObject); } -#endif //Q_CLANG_QDOC +#endif //Q_QDOC static bool disconnect(const QObject *sender, const char *signal, const QObject *receiver, const char *member); @@ -324,7 +324,7 @@ public: { return disconnect(this, nullptr, receiver, member); } static bool disconnect(const QMetaObject::Connection &); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename PointerToMemberFunction> static bool disconnect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method); #else @@ -357,7 +357,7 @@ public: return disconnectImpl(sender, reinterpret_cast<void **>(&signal), receiver, zero, &SignalType::Object::staticMetaObject); } -#endif //Q_CLANG_QDOC +#endif //Q_QDOC void dumpObjectTree() const; void dumpObjectInfo() const; @@ -466,7 +466,7 @@ qobject_iid_cast(const QObject *object) return qobject_iid_cast<std::remove_cv_t<T>>(o); } -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) # define Q_DECLARE_INTERFACE(IFace, IId) #elif !defined(Q_MOC_RUN) # define Q_DECLARE_INTERFACE(IFace, IId) \ diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 845e44882d1..673d588e327 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -233,7 +233,7 @@ struct Q_CORE_EXPORT QMetaObject { return const_cast<QObject *>(cast(const_cast<const QObject *>(obj))); } const QObject *cast(const QObject *obj) const; -#if !defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_TRANSLATION) || defined(Q_QDOC) QString tr(const char *s, const char *c, int n = -1) const; #endif // QT_NO_TRANSLATION @@ -355,7 +355,7 @@ struct Q_CORE_EXPORT QMetaObject #endif // Qt < 7.0 template <typename... Args> static -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -369,7 +369,7 @@ struct Q_CORE_EXPORT QMetaObject } template <typename... Args> static -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -381,7 +381,7 @@ struct Q_CORE_EXPORT QMetaObject } template <typename... Args> static -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -393,7 +393,7 @@ struct Q_CORE_EXPORT QMetaObject } template <typename... Args> static -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC bool #else QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> @@ -404,7 +404,7 @@ struct Q_CORE_EXPORT QMetaObject return invokeMethod(obj, member, Qt::AutoConnection, r, std::forward<Args>(arguments)...); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename Functor, typename FunctorReturnType> static bool invokeMethod(QObject *context, Functor function, Qt::ConnectionType type = Qt::AutoConnection, FunctorReturnType *ret = nullptr); template<typename Functor, typename FunctorReturnType> @@ -499,7 +499,7 @@ struct Q_CORE_EXPORT QMetaObject #endif template <typename... Args> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QObject * #else QtPrivate::Invoke::IfNotOldStyleArgs<QObject *, Args...> diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index fbd838654ff..c376fd9b2b2 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -13,7 +13,7 @@ #include <QtCore/qpropertyprivate.h> -#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) +#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) #include <source_location> #if defined(__cpp_lib_source_location) #define QT_SOURCE_LOCATION_NAMESPACE std @@ -22,7 +22,7 @@ #endif #endif -#if __has_include(<experimental/source_location>) && !defined(Q_CLANG_QDOC) +#if __has_include(<experimental/source_location>) && !defined(Q_QDOC) #include <experimental/source_location> #if !defined(QT_PROPERTY_COLLECT_BINDING_LOCATION) #if defined(__cpp_lib_experimental_source_location) @@ -334,7 +334,7 @@ public: explicit QProperty(const QPropertyBinding<T> &binding) : QProperty() { setBinding(binding); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> explicit QProperty(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = nullptr) @@ -417,7 +417,7 @@ public: return true; } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> QPropertyBinding<T> setBinding(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, @@ -759,7 +759,7 @@ public: #endif return QPropertyBinding<T>(); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> QPropertyBinding<T> setBinding(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, @@ -861,7 +861,7 @@ public: return QBindable<T>(aliasedProperty(), iface).setBinding(newBinding); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> QPropertyBinding<T> setBinding(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, @@ -951,7 +951,7 @@ public: explicit QObjectBindableProperty(const QPropertyBinding<T> &binding) : QObjectBindableProperty() { setBinding(binding); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> explicit QObjectBindableProperty(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = nullptr) @@ -1044,7 +1044,7 @@ public: return true; } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> QPropertyBinding<T> setBinding(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index 2fa6cfca0c6..38380f0207b 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/src/corelib/kernel/qproperty_p.h @@ -570,7 +570,7 @@ public: return true; } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename Functor> QPropertyBinding<T> setBinding(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 00c06186c36..5599b60bd76 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -49,7 +49,7 @@ public: static void singleShot(int msec, const QObject *receiver, const char *member); static void singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, const char *member); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename PointerToMemberFunction> static void singleShot(int msec, const QObject *receiver, PointerToMemberFunction method); template<typename PointerToMemberFunction> diff --git a/src/corelib/kernel/qtmetamacros.h b/src/corelib/kernel/qtmetamacros.h index 79e3375ed5b..1ce6a49bdef 100644 --- a/src/corelib/kernel/qtmetamacros.h +++ b/src/corelib/kernel/qtmetamacros.h @@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE # define QT_TR_FUNCTIONS #endif -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC #define QT_TR_FUNCTIONS #endif diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 98193cfc4e8..844ad3cd65a 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -429,7 +429,7 @@ public: } template<typename T> -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC static inline auto fromValue(const T &value) noexcept(std::is_nothrow_copy_constructible_v<T> && Private::CanUseInternalSpace<T>) -> std::enable_if_t<std::is_copy_constructible_v<T> && std::is_destructible_v<T>, QVariant> diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index 560a5ab9658..bd0ece1f5b6 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -6,7 +6,7 @@ #include "QtCore/qobject.h" -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) QT_BEGIN_NAMESPACE diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h index f95c8ce3307..098b7d42017 100644 --- a/src/corelib/plugin/qfactoryinterface.h +++ b/src/corelib/plugin/qfactoryinterface.h @@ -15,7 +15,7 @@ struct Q_CORE_EXPORT QFactoryInterface virtual QStringList keys() const = 0; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_INTERFACE(QFactoryInterface, "org.qt-project.Qt.QFactoryInterface") #endif diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 376b06c726b..64aa891ba13 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -6,7 +6,7 @@ #include <QtCore/qstring.h> -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) #ifndef GUID_DEFINED #define GUID_DEFINED typedef struct _GUID @@ -19,7 +19,7 @@ typedef struct _GUID #endif #endif -#if defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) Q_FORWARD_DECLARE_CF_TYPE(CFUUID); Q_FORWARD_DECLARE_OBJC_CLASS(NSUUID); #endif @@ -101,7 +101,7 @@ public: bool operator<(const QUuid &other) const noexcept; bool operator>(const QUuid &other) const noexcept; -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) // On Windows we have a type GUID that is used by the platform API, so we // provide convenience operators to cast from and to this type. constexpr QUuid(const GUID &guid) noexcept @@ -151,7 +151,7 @@ public: QUuid::Variant variant() const noexcept; QUuid::Version version() const noexcept; -#if defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_DARWIN) || defined(Q_QDOC) static QUuid fromCFUUID(CFUUIDRef uuid); CFUUIDRef toCFUUID() const Q_DECL_CF_RETURNS_RETAINED; static QUuid fromNSUUID(const NSUUID *uuid); diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index 20541725ec5..8d89e4bb457 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -404,7 +404,7 @@ typename std::enable_if_t<std::is_enum<T>::value, QDataStream &> operator>>(QDataStream &s, T &t) { return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template<typename T> inline QDataStreamIfHasIStreamOperatorsContainer<QList<T>, T> operator>>(QDataStream &s, QList<T> &v) @@ -537,7 +537,7 @@ QDataStream &operator>>(QDataStream& s, std::pair<T1, T2> &p); template <class T1, class T2> QDataStream &operator<<(QDataStream& s, const std::pair<T1, T2> &p); -#endif // Q_CLANG_QDOC +#endif // Q_QDOC inline QDataStream &operator>>(QDataStream &s, QKeyCombination &combination) { diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index a77aab38953..01df13d0976 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -251,7 +251,7 @@ QVariant QJsonDocument::toVariant() const \sa fromJson(), JsonFormat */ -#if !defined(QT_JSON_READONLY) || defined(Q_CLANG_QDOC) +#if !defined(QT_JSON_READONLY) || defined(Q_QDOC) QByteArray QJsonDocument::toJson(JsonFormat format) const { QByteArray json; diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index e580c0122d8..350c6bb76db 100644 --- a/src/corelib/serialization/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h @@ -80,7 +80,7 @@ public: static QJsonDocument fromJson(const QByteArray &json, QJsonParseError *error = nullptr); -#if !defined(QT_JSON_READONLY) || defined(Q_CLANG_QDOC) +#if !defined(QT_JSON_READONLY) || defined(Q_QDOC) QByteArray toJson(JsonFormat format = Indented) const; #endif diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h index 2f8291b168d..bdb2387ebba 100644 --- a/src/corelib/text/qanystringview.h +++ b/src/corelib/text/qanystringview.h @@ -163,7 +163,7 @@ public: constexpr QAnyStringView(const Char *f, const Char *l) : QAnyStringView(f, l - f) {} -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Char, size_t N> constexpr QAnyStringView(const Char (&array)[N]) noexcept; diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index d73224cf17d..1079555c84c 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -173,7 +173,7 @@ public: void truncate(qsizetype pos); void chop(qsizetype n); -#if !defined(Q_CLANG_QDOC) +#if !defined(Q_QDOC) [[nodiscard]] QByteArray toLower() const & { return toLower_helper(*this); } [[nodiscard]] QByteArray toLower() && diff --git a/src/corelib/text/qbytearraylist.h b/src/corelib/text/qbytearraylist.h index 59df569456c..f5302884f1b 100644 --- a/src/corelib/text/qbytearraylist.h +++ b/src/corelib/text/qbytearraylist.h @@ -19,7 +19,7 @@ typedef QListIterator<QByteArray> QByteArrayListIterator; typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; #endif -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC namespace QtPrivate { #if QT_CORE_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4 @@ -29,13 +29,13 @@ namespace QtPrivate { } #endif -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC class QByteArrayList : public QList<QByteArray> #else template <> struct QListSpecialMethods<QByteArray> : QListSpecialMethodsBase<QByteArray> #endif { -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC protected: ~QListSpecialMethods() = default; #endif diff --git a/src/corelib/text/qchar.h b/src/corelib/text/qchar.h index 904611d87da..e9f0cf3346c 100644 --- a/src/corelib/text/qchar.h +++ b/src/corelib/text/qchar.h @@ -81,7 +81,7 @@ public: constexpr Q_IMPLICIT QChar(SpecialCharacter s) noexcept : ucs(char16_t(s)) {} constexpr Q_IMPLICIT QChar(QLatin1Char ch) noexcept : ucs(ch.unicode()) {} constexpr Q_IMPLICIT QChar(char16_t ch) noexcept : ucs(ch) {} -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) constexpr Q_IMPLICIT QChar(wchar_t ch) noexcept : ucs(char16_t(ch)) {} #endif diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 512fa489f9a..d30bc0b8514 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -51,7 +51,7 @@ namespace QtPrivate { template <bool...B> class BoolList; } -#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || defined(Q_CLANG_QDOC) +#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || defined(Q_QDOC) # define Q_L1S_VIEW_IS_PRIMARY class QLatin1StringView #else @@ -443,7 +443,7 @@ public: QString(QChar c); QString(qsizetype size, QChar c); inline QString(QLatin1StringView latin1); -#if defined(__cpp_char8_t) || defined(Q_CLANG_QDOC) +#if defined(__cpp_char8_t) || defined(Q_QDOC) Q_WEAK_OVERLOAD inline QString(const char8_t *str) : QString(fromUtf8(str)) @@ -536,7 +536,7 @@ private: public: template <typename...Args> [[nodiscard]] -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QString #else typename std::enable_if< @@ -646,7 +646,7 @@ public: [[nodiscard]] QString leftJustified(qsizetype width, QChar fill = u' ', bool trunc = false) const; [[nodiscard]] QString rightJustified(qsizetype width, QChar fill = u' ', bool trunc = false) const; -#if !defined(Q_CLANG_QDOC) +#if !defined(Q_QDOC) [[nodiscard]] QString toLower() const & { return toLower_helper(*this); } [[nodiscard]] QString toLower() && @@ -772,7 +772,7 @@ public: const ushort *utf16() const; // ### Qt 7 char16_t -#if !defined(Q_CLANG_QDOC) +#if !defined(Q_QDOC) [[nodiscard]] QByteArray toLatin1() const & { return toLatin1_helper(*this); } [[nodiscard]] QByteArray toLatin1() && @@ -807,7 +807,7 @@ public: { return fromUtf8(QByteArrayView(utf8, !utf8 || size < 0 ? qstrlen(utf8) : size)); } -#if defined(__cpp_char8_t) || defined(Q_CLANG_QDOC) +#if defined(__cpp_char8_t) || defined(Q_QDOC) Q_WEAK_OVERLOAD static inline QString fromUtf8(const char8_t *str) { return fromUtf8(reinterpret_cast<const char *>(str)); } diff --git a/src/corelib/text/qstringfwd.h b/src/corelib/text/qstringfwd.h index d7be5f11db6..2e3c9e82480 100644 --- a/src/corelib/text/qstringfwd.h +++ b/src/corelib/text/qstringfwd.h @@ -26,7 +26,7 @@ QT_END_NO_CHAR8_T_NAMESPACE class QByteArray; class QByteArrayView; -#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || defined(Q_CLANG_QDOC) +#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) || defined(QT_BOOTSTRAPPED) || defined(Q_QDOC) class QLatin1StringView; using QLatin1String = QLatin1StringView; #else @@ -40,7 +40,7 @@ class QChar; class QRegularExpression; class QRegularExpressionMatch; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC // ### Qt 7: remove the non-char8_t version of QUtf8StringView QT_BEGIN_NO_CHAR8_T_NAMESPACE using QUtf8StringView = QBasicUtf8StringView<false>; @@ -49,7 +49,7 @@ QT_END_NO_CHAR8_T_NAMESPACE QT_BEGIN_HAS_CHAR8_T_NAMESPACE using QUtf8StringView = QBasicUtf8StringView<true>; QT_END_HAS_CHAR8_T_NAMESPACE -#endif // Q_CLANG_QDOC +#endif // Q_QDOC QT_END_NAMESPACE diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index d820ec8ad0d..2015927f190 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -150,7 +150,7 @@ public: constexpr QStringView(const Char *f, const Char *l) : QStringView(f, l - f) {} -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Char, size_t N> constexpr QStringView(const Char (&array)[N]) noexcept; @@ -163,7 +163,7 @@ public: : QStringView(str, str ? lengthHelperPointer(str) : 0) {} #endif -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QStringView(const QString &str) noexcept; #else template <typename String, if_compatible_qstring_like<String> = true> diff --git a/src/corelib/text/qutf8stringview.h b/src/corelib/text/qutf8stringview.h index 232b6f43f77..3baac9c885e 100644 --- a/src/corelib/text/qutf8stringview.h +++ b/src/corelib/text/qutf8stringview.h @@ -83,7 +83,7 @@ struct wrap_char { using type = char; }; } // namespace QtPrivate -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC #define QBasicUtf8StringView QUtf8StringView #else template <bool UseChar8T> @@ -91,7 +91,7 @@ template <bool UseChar8T> class QBasicUtf8StringView { public: -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC using storage_type = typename std::conditional<UseChar8T, QtPrivate::hide_char8_t, QtPrivate::wrap_char @@ -162,7 +162,7 @@ public: constexpr QBasicUtf8StringView(const Char *f, const Char *l) : QBasicUtf8StringView(f, l - f) {} -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename Char, size_t N> constexpr QBasicUtf8StringView(const Char (&array)[N]) noexcept; @@ -175,7 +175,7 @@ public: str ? std::char_traits<std::remove_cv_t<std::remove_pointer_t<Pointer>>>::length(str) : 0) {} #endif -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QBasicUtf8StringView(const QByteArray &str) noexcept; #else template <typename String, if_compatible_qstring_like<String> = true> @@ -200,7 +200,7 @@ public: [[nodiscard]] constexpr qsizetype size() const noexcept { return m_size; } [[nodiscard]] const_pointer data() const noexcept { return reinterpret_cast<const_pointer>(m_data); } -#if defined(__cpp_char8_t) || defined(Q_CLANG_QDOC) +#if defined(__cpp_char8_t) || defined(Q_QDOC) [[nodiscard]] const char8_t *utf8() const noexcept { return reinterpret_cast<const char8_t*>(m_data); } #endif @@ -321,12 +321,12 @@ private: qsizetype m_size; }; -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC #undef QBasicUtf8StringView #else template <bool UseChar8T> Q_DECLARE_TYPEINFO_BODY(QBasicUtf8StringView<UseChar8T>, Q_PRIMITIVE_TYPE); -#endif // Q_CLANG_QDOC +#endif // Q_QDOC template <typename QStringLike, std::enable_if_t<std::is_same_v<QStringLike, QByteArray>, bool> = true> [[nodiscard]] inline q_no_char8_t::QUtf8StringView qToUtf8StringViewIgnoringNull(const QStringLike &s) noexcept diff --git a/src/corelib/text/qvsnprintf.cpp b/src/corelib/text/qvsnprintf.cpp index 4e6845ad1c7..839fc242170 100644 --- a/src/corelib/text/qvsnprintf.cpp +++ b/src/corelib/text/qvsnprintf.cpp @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_VSNPRINTF) || defined(Q_CLANG_QDOC) +#if !defined(QT_VSNPRINTF) || defined(Q_QDOC) /*! \relates QByteArray diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index e0e9ca947c5..24f2616e82f 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -34,7 +34,7 @@ public: return *this; } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC T loadRelaxed() const; T loadAcquire() const; void storeRelaxed(T newValue); diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index 6b066c30753..a623dc1c6e5 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -4,7 +4,7 @@ #include "qexception.h" #include "QtCore/qshareddata.h" -#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_QDOC) QT_BEGIN_NAMESPACE @@ -180,7 +180,7 @@ QUnhandledException *QUnhandledException::clone() const return new QUnhandledException(*this); } -#if !defined(Q_CLANG_QDOC) +#if !defined(Q_QDOC) namespace QtPrivate { @@ -224,7 +224,7 @@ void ExceptionStore::rethrowException() const } // namespace QtPrivate -#endif //Q_CLANG_QDOC +#endif //Q_QDOC QT_END_NAMESPACE diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h index b9c9c584944..62b9e70bea4 100644 --- a/src/corelib/thread/qexception.h +++ b/src/corelib/thread/qexception.h @@ -16,7 +16,7 @@ QT_REQUIRE_CONFIG(future); QT_BEGIN_NAMESPACE -#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_QDOC) class Q_CORE_EXPORT QException : public std::exception { diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h index 5b618e5acbd..34fb8a039db 100644 --- a/src/corelib/thread/qfuture.h +++ b/src/corelib/thread/qfuture.h @@ -55,7 +55,7 @@ public: return *this; } -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) ~QFuture() { } QFuture(const QFuture<T> &) { } QFuture<T> & operator=(const QFuture<T> &) { } @@ -155,7 +155,7 @@ QT_WARNING_POP template<class Function, typename = std::enable_if_t<std::is_invocable_r_v<T, Function>>> QFuture<T> onCanceled(QObject *context, Function &&handler); -#if !defined(Q_CLANG_QDOC) +#if !defined(Q_QDOC) template<class U = T, typename = std::enable_if_t<QtPrivate::isQFutureV<U>>> auto unwrap(); #else @@ -445,7 +445,7 @@ struct MetaTypeQFutureHelper<QFuture<T>> namespace QtFuture { -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template<typename OutputSequence, typename InputIt, typename ValueType = typename std::iterator_traits<InputIt>::value_type, @@ -520,7 +520,7 @@ QFuture<QtFuture::WhenAnyResult<T>> whenAny(InputIt first, InputIt last); template<typename... Futures> QFuture<std::variant<std::decay_t<Futures>...>> whenAny(Futures &&... futures); -#endif // Q_CLANG_QDOC +#endif // Q_QDOC } // namespace QtFuture diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index 8e96b943ef9..6bf3a7406a5 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -960,7 +960,7 @@ static QFuture<std::decay_t<T>> makeReadyFuture(T &&value) return promise.future(); } -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) static QFuture<void> makeReadyFuture() #else template<typename T = void> diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index ab531ef70e9..af77f556fd4 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -17,7 +17,7 @@ class tst_QMutex; QT_BEGIN_NAMESPACE -#if QT_CONFIG(thread) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(thread) || defined(Q_QDOC) #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) // these platforms use futex # define QT_MUTEX_LOCK_NOEXCEPT noexcept @@ -289,7 +289,7 @@ private: bool m_isLocked = false; }; -#else // !QT_CONFIG(thread) && !Q_CLANG_QDOC +#else // !QT_CONFIG(thread) && !Q_QDOC class QMutex { @@ -339,7 +339,7 @@ private: typedef QMutex QBasicMutex; -#endif // !QT_CONFIG(thread) && !Q_CLANG_QDOC +#endif // !QT_CONFIG(thread) && !Q_QDOC QT_END_NAMESPACE diff --git a/src/corelib/thread/qpromise.h b/src/corelib/thread/qpromise.h index 43c30582be1..5620811bae8 100644 --- a/src/corelib/thread/qpromise.h +++ b/src/corelib/thread/qpromise.h @@ -79,7 +79,7 @@ public: d.swap(other.d); } -#if defined(Q_CLANG_QDOC) // documentation-only simplified signatures +#if defined(Q_QDOC) // documentation-only simplified signatures bool addResult(const T &result, int index = -1) { } bool addResult(T &&result, int index = -1) { } #endif diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index d856d8daa84..e9af85ee993 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -69,7 +69,7 @@ public: bool event(QEvent *event) override; int loopLevel() const; -#if QT_CONFIG(cxx11_future) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(cxx11_future) || defined(Q_QDOC) template <typename Function, typename... Args> [[nodiscard]] static QThread *create(Function &&f, Args &&... args); #endif diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index c8d791f2004..b876c4648f3 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -28,7 +28,7 @@ template <typename T> class QStack; template <typename T, qsizetype Prealloc = 256> class QVarLengthArray; template <typename T> class QList; class QString; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template<typename T> using QVector = QList<T>; using QStringList = QList<QString>; class QByteArray; diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index 70703fe0abb..98fa82fda92 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -63,7 +63,7 @@ public: QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QContiguousCache) void swap(QContiguousCache &other) noexcept { qt_ptr_swap(d, other.d); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename U = T> QTypeTraits::compare_eq_result<U> operator==(const QContiguousCache<T> &other) const { @@ -85,7 +85,7 @@ public: #else bool operator==(const QContiguousCache &other) const; bool operator!=(const QContiguousCache &other) const; -#endif // Q_CLANG_QDOC +#endif // Q_QDOC inline qsizetype capacity() const {return d->alloc; } inline qsizetype count() const { return d->count; } diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 5aa0acd9eaa..2d2061c7073 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -1440,7 +1440,7 @@ size_t qHash(double key, size_t seed) noexcept } } -#if !defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC) +#if !defined(Q_OS_DARWIN) || defined(Q_QDOC) /*! \relates QHash \since 5.3 diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 9b27415244f..eedb594e265 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -891,7 +891,7 @@ public: #endif void swap(QHash &other) noexcept { qt_ptr_swap(d, other.d); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename AKey = Key, typename AT = T> QTypeTraits::compare_eq_result_container<QHash, AKey, AT> operator==(const QHash &other) const noexcept { @@ -914,7 +914,7 @@ public: #else bool operator==(const QHash &other) const; bool operator!=(const QHash &other) const; -#endif // Q_CLANG_QDOC +#endif // Q_QDOC inline qsizetype size() const noexcept { return d ? qsizetype(d->size) : 0; } inline bool isEmpty() const noexcept { return !d || d->size == 0; } @@ -1438,7 +1438,7 @@ public: std::swap(m_size, other.m_size); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename AKey = Key, typename AT = T> QTypeTraits::compare_eq_result_container<QMultiHash, AKey, AT> operator==(const QMultiHash &other) const noexcept { @@ -1479,7 +1479,7 @@ public: #else bool operator==(const QMultiHash &other) const; bool operator!=(const QMultiHash &other) const; -#endif // Q_CLANG_QDOC +#endif // Q_QDOC inline qsizetype size() const noexcept { return m_size; } diff --git a/src/corelib/tools/qhashfunctions.h b/src/corelib/tools/qhashfunctions.h index c946cc61bc0..029d98674c2 100644 --- a/src/corelib/tools/qhashfunctions.h +++ b/src/corelib/tools/qhashfunctions.h @@ -120,7 +120,7 @@ Q_DECL_CONST_FUNCTION inline size_t qHash(float key, size_t seed = 0) noexcept return QHashPrivate::hash(k, seed); } Q_CORE_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(double key, size_t seed = 0) noexcept; -#if !defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC) +#if !defined(Q_OS_DARWIN) || defined(Q_QDOC) Q_CORE_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(long double key, size_t seed = 0) noexcept; #endif Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(wchar_t key, size_t seed = 0) noexcept diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index ce161f62a1e..2856510d937 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -317,7 +317,7 @@ public: void swap(QList &other) noexcept { d.swap(other.d); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename U = T> QTypeTraits::compare_eq_result_container<QList, U> operator==(const QList &other) const { @@ -373,7 +373,7 @@ public: bool operator>(const QList &other) const; bool operator<=(const QList &other) const; bool operator>=(const QList &other) const; -#endif // Q_CLANG_QDOC +#endif // Q_QDOC qsizetype size() const noexcept { return d->size; } qsizetype count() const noexcept { return size(); } diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 9ba01bee2cb..1a6506348f1 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -240,7 +240,7 @@ public: return {}; } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename AKey = Key, typename AT = T> friend QTypeTraits::compare_eq_result_container<QMap, AKey, AT> operator==(const QMap &lhs, const QMap &rhs) { @@ -261,7 +261,7 @@ public: #else friend bool operator==(const QMap &lhs, const QMap &rhs); friend bool operator!=(const QMap &lhs, const QMap &rhs); -#endif // Q_CLANG_QDOC +#endif // Q_QDOC size_type size() const { return d ? size_type(d->m.size()) : size_type(0); } @@ -885,7 +885,7 @@ public: return {}; } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename AKey = Key, typename AT = T> friend QTypeTraits::compare_eq_result_container<QMultiMap, AKey, AT> operator==(const QMultiMap &lhs, const QMultiMap &rhs) { @@ -906,7 +906,7 @@ public: #else friend bool operator==(const QMultiMap &lhs, const QMultiMap &rhs); friend bool operator!=(const QMultiMap &lhs, const QMultiMap &rhs); -#endif // Q_CLANG_QDOC +#endif // Q_QDOC size_type size() const { return d ? size_type(d->m.size()) : size_type(0); } diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 2981bffa353..a59670cccac 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -35,7 +35,7 @@ public: inline void swap(QSet<T> &other) noexcept { q_hash.swap(other.q_hash); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC template <typename U = T> QTypeTraits::compare_eq_result_container<QSet, U> operator==(const QSet<T> &other) const { return q_hash == other.q_hash; } diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index c227186e941..eae68144fe6 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -29,7 +29,7 @@ public: void swap(QDBusPendingCall &other) noexcept { d.swap(other.d); } -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC // pretend that they aren't here bool isFinished() const; void waitForFinished(); diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 12444c6c0cd..580b967b3bd 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -81,7 +81,7 @@ public: return qdbus_cast<ResultType>(argumentAt(Index)); } -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) bool isFinished() const; void waitForFinished(); QVariant argumentAt(int index) const; diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 6af8573c1d9..c2f26a1e255 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -573,7 +573,7 @@ protected: int m_lastColumn; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC #define QAccessibleInterface_iid "org.qt-project.Qt.QAccessibleInterface" Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid) #endif diff --git a/src/gui/doc/includes/windows.h b/src/gui/doc/includes/windows.h index e9006982554..b4824c2e932 100644 --- a/src/gui/doc/includes/windows.h +++ b/src/gui/doc/includes/windows.h @@ -15,7 +15,7 @@ // // Dummy declarations for generating docs on non-Windows platforms -#if !defined(Q_OS_WIN) && defined(Q_CLANG_QDOC) +#if !defined(Q_OS_WIN) && defined(Q_QDOC) typedef struct _FORMATETC {} FORMATETC; typedef struct _STGMEDIUM {} STGMEDIUM; typedef void *IDataObject; diff --git a/src/gui/kernel/qaction.h b/src/gui/kernel/qaction.h index 8d770301484..d805599138f 100644 --- a/src/gui/kernel/qaction.h +++ b/src/gui/kernel/qaction.h @@ -74,7 +74,7 @@ public: QList<QObject *> associatedObjects() const; #if QT_DEPRECATED_SINCE(6,0) -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QWidget *parentWidget() const; QList<QWidget*> associatedWidgets() const; QList<QGraphicsWidget*> associatedGraphicsWidgets() const; @@ -178,7 +178,7 @@ public: void setMenuRole(MenuRole menuRole); MenuRole menuRole() const; -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QMenu *menu() const; void setMenu(QMenu *menu); #else diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 82c9f45ad26..e68eb217e26 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -335,7 +335,7 @@ private: namespace QNativeInterface::Private { -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) class QWindowsMime; diff --git a/src/gui/kernel/qguiapplication_platform.h b/src/gui/kernel/qguiapplication_platform.h index 3220373c5ef..24ee166ac08 100644 --- a/src/gui/kernel/qguiapplication_platform.h +++ b/src/gui/kernel/qguiapplication_platform.h @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE namespace QNativeInterface { -#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb) || defined(Q_QDOC) struct Q_GUI_EXPORT QX11Application { QT_DECLARE_NATIVE_INTERFACE(QX11Application, 1, QGuiApplication) diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h index eb35724811b..96c56206656 100644 --- a/src/gui/kernel/qkeymapper_p.h +++ b/src/gui/kernel/qkeymapper_p.h @@ -67,7 +67,7 @@ QKeyMapperPrivate *qt_keymapper_private(); // from qkeymapper.cpp namespace QNativeInterface::Private { -#if QT_CONFIG(evdev) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(evdev) || defined(Q_QDOC) struct Q_GUI_EXPORT QEvdevKeyMapper { QT_DECLARE_NATIVE_INTERFACE(QEvdevKeyMapper, 1, QKeyMapper) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 79b210d0358..338ec08357e 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE using namespace Qt::StringLiterals; -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) Q_CONSTINIT static bool qt_sequence_no_mnemonics = true; struct MacSpecialKey { int key; diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 3e99f669def..44fd1f9ccae 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -17,12 +17,12 @@ class QKeySequence; /***************************************************************************** QKeySequence stream functions *****************************************************************************/ -#if !defined(QT_NO_DATASTREAM) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_DATASTREAM) || defined(Q_QDOC) Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks); #endif -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) void qt_set_sequence_auto_mnemonic(bool b); #endif @@ -186,7 +186,7 @@ public: Q_DECLARE_SHARED(QKeySequence) -#if !defined(QT_NO_DEBUG_STREAM) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_DEBUG_STREAM) || defined(Q_QDOC) Q_GUI_EXPORT QDebug operator<<(QDebug, const QKeySequence &); #endif diff --git a/src/gui/kernel/qoffscreensurface_platform.h b/src/gui/kernel/qoffscreensurface_platform.h index a093c08b159..33e72c7e17f 100644 --- a/src/gui/kernel/qoffscreensurface_platform.h +++ b/src/gui/kernel/qoffscreensurface_platform.h @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE namespace QNativeInterface { -#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_ANDROID) || defined(Q_QDOC) struct Q_GUI_EXPORT QAndroidOffscreenSurface { QT_DECLARE_NATIVE_INTERFACE(QAndroidOffscreenSurface, 1, QOffscreenSurface) diff --git a/src/gui/kernel/qopenglcontext_platform.h b/src/gui/kernel/qopenglcontext_platform.h index c575b56c31f..fe36478a653 100644 --- a/src/gui/kernel/qopenglcontext_platform.h +++ b/src/gui/kernel/qopenglcontext_platform.h @@ -34,7 +34,7 @@ typedef void *EGLDisplay; typedef void *EGLConfig; #endif -#if !defined(Q_OS_MACOS) && defined(Q_CLANG_QDOC) +#if !defined(Q_OS_MACOS) && defined(Q_QDOC) typedef void *NSOpenGLContext; #endif @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE namespace QNativeInterface { -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QCocoaGLContext { QT_DECLARE_NATIVE_INTERFACE(QCocoaGLContext, 1, QOpenGLContext) @@ -51,7 +51,7 @@ struct Q_GUI_EXPORT QCocoaGLContext }; #endif -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) struct Q_GUI_EXPORT QWGLContext { QT_DECLARE_NATIVE_INTERFACE(QWGLContext, 1, QOpenGLContext) @@ -61,7 +61,7 @@ struct Q_GUI_EXPORT QWGLContext }; #endif -#if QT_CONFIG(xcb_glx_plugin) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb_glx_plugin) || defined(Q_QDOC) struct Q_GUI_EXPORT QGLXContext { QT_DECLARE_NATIVE_INTERFACE(QGLXContext, 1, QOpenGLContext) @@ -71,7 +71,7 @@ struct Q_GUI_EXPORT QGLXContext }; #endif -#if QT_CONFIG(egl) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(egl) || defined(Q_QDOC) struct Q_GUI_EXPORT QEGLContext { QT_DECLARE_NATIVE_INTERFACE(QEGLContext, 1, QOpenGLContext) diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index aa4fe078a19..12f85052559 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -569,7 +569,7 @@ void QPlatformIntegration::setApplicationIcon(const QIcon &icon) const Q_UNUSED(icon); } -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) /*! Factory function for QPlatformVulkanInstance. The \a instance parameter is a diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index f718e1e45b0..7c166ee6980 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -192,7 +192,7 @@ public: virtual void beep() const; virtual void quit() const; -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) virtual QPlatformVulkanInstance *createPlatformVulkanInstance(QVulkanInstance *instance) const; #endif diff --git a/src/gui/kernel/qplatformmenu_p.h b/src/gui/kernel/qplatformmenu_p.h index 22eba7af412..00e3fa56dae 100644 --- a/src/gui/kernel/qplatformmenu_p.h +++ b/src/gui/kernel/qplatformmenu_p.h @@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE // ----------------- QNativeInterface ----------------- -#if !defined(Q_OS_MACOS) && defined(Q_CLANG_QDOC) +#if !defined(Q_OS_MACOS) && defined(Q_QDOC) typedef void NSMenu; #else QT_END_NAMESPACE @@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE namespace QNativeInterface::Private { -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QCocoaMenu { QT_DECLARE_NATIVE_INTERFACE(QCocoaMenu) diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h index 6c79978f796..c47cee27460 100644 --- a/src/gui/kernel/qplatformscreen_p.h +++ b/src/gui/kernel/qplatformscreen_p.h @@ -38,7 +38,7 @@ public: namespace QNativeInterface::Private { -#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb) || defined(Q_QDOC) struct Q_GUI_EXPORT QXcbScreen { QT_DECLARE_NATIVE_INTERFACE(QXcbScreen, 1, QScreen) @@ -46,7 +46,7 @@ struct Q_GUI_EXPORT QXcbScreen }; #endif -#if QT_CONFIG(vsp2) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vsp2) || defined(Q_QDOC) struct Q_GUI_EXPORT QVsp2Screen { QT_DECLARE_NATIVE_INTERFACE(QVsp2Screen, 1, QScreen) @@ -59,7 +59,7 @@ struct Q_GUI_EXPORT QVsp2Screen }; #endif -#if defined(Q_OS_WEBOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WEBOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QWebOSScreen { QT_DECLARE_NATIVE_INTERFACE(QWebOSScreen, 1, QScreen) @@ -72,7 +72,7 @@ struct Q_GUI_EXPORT QWebOSScreen }; #endif -#if defined(Q_OS_WIN32) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN32) || defined(Q_QDOC) struct Q_GUI_EXPORT QWindowsScreen { QT_DECLARE_NATIVE_INTERFACE(QWindowsScreen, 1, QScreen) diff --git a/src/gui/kernel/qplatformwindow_p.h b/src/gui/kernel/qplatformwindow_p.h index 8facac927d4..62dc87779e0 100644 --- a/src/gui/kernel/qplatformwindow_p.h +++ b/src/gui/kernel/qplatformwindow_p.h @@ -35,7 +35,7 @@ public: namespace QNativeInterface::Private { -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QCocoaWindow { QT_DECLARE_NATIVE_INTERFACE(QCocoaWindow, 1, QWindow) @@ -44,7 +44,7 @@ struct Q_GUI_EXPORT QCocoaWindow }; #endif -#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb) || defined(Q_QDOC) struct Q_GUI_EXPORT QXcbWindow { QT_DECLARE_NATIVE_INTERFACE(QXcbWindow, 1, QWindow) @@ -76,7 +76,7 @@ struct Q_GUI_EXPORT QXcbWindow }; #endif // xcb -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) struct Q_GUI_EXPORT QWindowsWindow { QT_DECLARE_NATIVE_INTERFACE(QWindowsWindow, 1, QWindow) diff --git a/src/gui/kernel/qshortcut.h b/src/gui/kernel/qshortcut.h index d6b48c2817c..00b9168bea8 100644 --- a/src/gui/kernel/qshortcut.h +++ b/src/gui/kernel/qshortcut.h @@ -32,7 +32,7 @@ public: const char *member = nullptr, const char *ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename Functor> QShortcut(const QKeySequence &key, QObject *parent, Functor functor, @@ -177,7 +177,7 @@ public: QString whatsThis() const; #if QT_DEPRECATED_SINCE(6,0) -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC QWidget *parentWidget() const; #else template<typename T = QWidget*> diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index afbde036197..2d664f11170 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -3071,7 +3071,7 @@ QDebug operator<<(QDebug debug, const QWindow *window) } #endif // !QT_NO_DEBUG_STREAM -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) /*! Associates this window with the specified Vulkan \a instance. diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 12d2af83194..a5ec47708a9 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -55,7 +55,7 @@ class QWindowContainer; #ifndef QT_NO_DEBUG_STREAM class QDebug; #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) class QVulkanInstance; #endif @@ -248,7 +248,7 @@ public: static QWindow *fromWinId(WId id); -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) void setVulkanInstance(QVulkanInstance *instance); QVulkanInstance *vulkanInstance() const; #endif diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index a3d100b8472..05435903fbc 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -191,7 +191,7 @@ struct QOpenGLFunctionsPrivate; #undef glTexLevelParameteriv -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) #undef GLbitfield typedef unsigned int GLbitfield; #undef GLchar diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 7d912b29e57..fc403f60b13 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -636,7 +636,7 @@ bool QRegion::intersects(const QRegion ®ion) const */ -#if !defined (Q_OS_UNIX) && !defined (Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if !defined (Q_OS_UNIX) && !defined (Q_OS_WIN) || defined(Q_QDOC) /* \overload \since 4.4 diff --git a/src/gui/painting/qt_mips_asm_dsp_p.h b/src/gui/painting/qt_mips_asm_dsp_p.h index 0b54b889342..6b33285f32d 100644 --- a/src/gui/painting/qt_mips_asm_dsp_p.h +++ b/src/gui/painting/qt_mips_asm_dsp_p.h @@ -19,7 +19,7 @@ #pragma qt_sync_stop_processing #endif -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC #define zero $0 #define AT $1 #define v0 $2 diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 67eea69f28c..dfafb1098fe 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -107,7 +107,7 @@ public: virtual void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) = 0; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_INTERFACE(QTextObjectInterface, "org.qt-project.Qt.QTextObjectInterface") #endif diff --git a/src/gui/vulkan/qplatformvulkaninstance.h b/src/gui/vulkan/qplatformvulkaninstance.h index a3dcc37f0b3..40ba602524c 100644 --- a/src/gui/vulkan/qplatformvulkaninstance.h +++ b/src/gui/vulkan/qplatformvulkaninstance.h @@ -15,7 +15,7 @@ #include <QtGui/qtguiglobal.h> -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #include <qvulkaninstance.h> @@ -56,7 +56,7 @@ QT_END_NAMESPACE #endif // QT_CONFIG(vulkan) -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) /* The following include file did not exist for clang-qdoc running in macOS, but the classes are documented in qvulkanfunctions.cpp. @@ -70,7 +70,7 @@ QT_END_NAMESPACE #include <QtGui/qtguiglobal.h> -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #ifndef VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES @@ -113,8 +113,8 @@ private: QT_END_NAMESPACE -#endif // QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#endif // QT_CONFIG(vulkan) || defined(Q_QDOC) #endif // QVULKANFUNCTIONS_H; -#endif // Q_CLANG_QDOC +#endif // Q_QDOC #endif // QPLATFORMVULKANINSTANCE_H diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index 44f737dfbcd..74ff0f62cdc 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -11,12 +11,12 @@ #pragma qt_sync_skip_header_check #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #ifndef VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES #endif -#if !defined(Q_CLANG_QDOC) && __has_include(<vulkan/vulkan.h>) +#if !defined(Q_QDOC) && __has_include(<vulkan/vulkan.h>) #include <vulkan/vulkan.h> #else // QT_CONFIG(vulkan) implies vulkan.h being available at Qt build time, but it @@ -45,7 +45,7 @@ typedef int VkDebugReportObjectTypeEXT; // QVulkanInstance itself is only applicable if vulkan.h is available, or if // it's qdoc. An application that is built on a vulkan.h-less system against a // Vulkan-enabled Qt gets the dummy typedefs but not QVulkan*. -#if __has_include(<vulkan/vulkan.h>) || defined(Q_CLANG_QDOC) +#if __has_include(<vulkan/vulkan.h>) || defined(Q_QDOC) #include <QtCore/qbytearraylist.h> #include <QtCore/qdebug.h> @@ -219,8 +219,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QVulkanInstance::DebugMessageSeverityFlags) QT_END_NAMESPACE -#endif // __has_include(<vulkan/vulkan.h>) || defined(Q_CLANG_QDOC) +#endif // __has_include(<vulkan/vulkan.h>) || defined(Q_QDOC) -#endif // QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#endif // QT_CONFIG(vulkan) || defined(Q_QDOC) #endif // QVULKANINSTANCE_H diff --git a/src/gui/vulkan/qvulkaninstance_p.h b/src/gui/vulkan/qvulkaninstance_p.h index 9545d4e6888..d707b301c6a 100644 --- a/src/gui/vulkan/qvulkaninstance_p.h +++ b/src/gui/vulkan/qvulkaninstance_p.h @@ -6,7 +6,7 @@ #include <QtGui/private/qtguiglobal_p.h> -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #include "qvulkaninstance.h" #include <private/qvulkanfunctions_p.h> diff --git a/src/gui/vulkan/qvulkanwindow.h b/src/gui/vulkan/qvulkanwindow.h index a2b538ed54e..d0bdd3683ec 100644 --- a/src/gui/vulkan/qvulkanwindow.h +++ b/src/gui/vulkan/qvulkanwindow.h @@ -11,7 +11,7 @@ #pragma qt_sync_skip_header_check #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #include <QtGui/qvulkaninstance.h> #include <QtGui/qwindow.h> @@ -19,7 +19,7 @@ #include <QtGui/qmatrix4x4.h> #include <QtCore/qset.h> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC typedef void* VkQueue; typedef void* VkCommandPool; typedef void* VkRenderPass; diff --git a/src/gui/vulkan/qvulkanwindow_p.h b/src/gui/vulkan/qvulkanwindow_p.h index 63273342225..9eaead9e07b 100644 --- a/src/gui/vulkan/qvulkanwindow_p.h +++ b/src/gui/vulkan/qvulkanwindow_p.h @@ -6,7 +6,7 @@ #include <QtGui/private/qtguiglobal_p.h> -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #include "qvulkanwindow.h" #include <QtCore/QHash> diff --git a/src/network/access/qhttp2configuration.h b/src/network/access/qhttp2configuration.h index 07d93ca1d65..4b3b7d54a25 100644 --- a/src/network/access/qhttp2configuration.h +++ b/src/network/access/qhttp2configuration.h @@ -8,7 +8,7 @@ #include <QtCore/qshareddata.h> -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC QT_REQUIRE_CONFIG(http); #endif diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp index 023d652721c..af5113ce2f1 100644 --- a/src/network/access/qnetworkrequest.cpp +++ b/src/network/access/qnetworkrequest.cpp @@ -6,7 +6,7 @@ #include "qplatformdefs.h" #include "qnetworkcookie.h" #include "qsslconfiguration.h" -#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(http) || defined(Q_QDOC) #include "qhttp2configuration.h" #include "private/http2protocol_p.h" #endif @@ -852,7 +852,7 @@ void QNetworkRequest::setPeerVerifyName(const QString &peerName) d->peerVerifyName = peerName; } -#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(http) || defined(Q_QDOC) /*! \since 5.14 @@ -938,9 +938,9 @@ void QNetworkRequest::setDecompressedSafetyCheckThreshold(qint64 threshold) { d->decompressedSafetyCheckThreshold = threshold; } -#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC) +#endif // QT_CONFIG(http) || defined(Q_QDOC) -#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) || defined (Q_OS_WASM) +#if QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) /*! \since 5.15 @@ -974,7 +974,7 @@ void QNetworkRequest::setTransferTimeout(int timeout) { d->transferTimeout = timeout; } -#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC) || defined (Q_OS_WASM) +#endif // QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) static QByteArray headerName(QNetworkRequest::KnownHeaders header) { diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index eea8dbfd93a..8dd16e16d79 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -143,18 +143,18 @@ public: QString peerVerifyName() const; void setPeerVerifyName(const QString &peerName); -#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(http) || defined(Q_QDOC) QHttp2Configuration http2Configuration() const; void setHttp2Configuration(const QHttp2Configuration &configuration); qint64 decompressedSafetyCheckThreshold() const; void setDecompressedSafetyCheckThreshold(qint64 threshold); -#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC) +#endif // QT_CONFIG(http) || defined(Q_QDOC) -#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) || defined (Q_OS_WASM) +#if QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) int transferTimeout() const; void setTransferTimeout(int timeout = DefaultTransferTimeoutConstant); -#endif // QT_CONFIG(http) || defined(Q_CLANG_QDOC) || defined (Q_OS_WASM) +#endif // QT_CONFIG(http) || defined(Q_QDOC) || defined (Q_OS_WASM) private: QSharedDataPointer<QNetworkRequestPrivate> d; friend class QNetworkRequestPrivate; diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index eac23ac296b..47db075b449 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -55,7 +55,7 @@ public: static QString localHostName(); static QString localDomainName(); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename Functor> static int lookupHost(const QString &name, Functor functor); template<typename Functor> diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h index 597448a0eac..dcc2f1102f8 100644 --- a/src/network/kernel/qnetworkdatagram.h +++ b/src/network/kernel/qnetworkdatagram.h @@ -55,7 +55,7 @@ public: QByteArray data() const; void setData(const QByteArray &data); -#if defined(Q_COMPILER_REF_QUALIFIERS) || defined(Q_CLANG_QDOC) +#if defined(Q_COMPILER_REF_QUALIFIERS) || defined(Q_QDOC) QNetworkDatagram makeReply(const QByteArray &payload) const & { return makeReply_helper(payload); } QNetworkDatagram makeReply(const QByteArray &payload) && diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index f421955e7ed..1d5d45096ab 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -8,7 +8,7 @@ #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) #include <QtNetwork/qabstractsocket.h> #endif -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC #include <QtNetwork/qhostaddress.h> #endif #include <QtCore/qiodevice.h> @@ -129,7 +129,7 @@ public: virtual bool bind(const QHostAddress &address, quint16 port = 0, BindMode mode = DefaultForPlatform); -#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) || defined(Q_CLANG_QDOC) +#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) || defined(Q_QDOC) bool bind(QHostAddress::SpecialAddress addr, quint16 port = 0, BindMode mode = DefaultForPlatform) { return bind(QHostAddress(addr), port, mode); } bool bind(quint16 port = 0, BindMode mode = DefaultForPlatform) diff --git a/src/network/socket/qsctpserver.h b/src/network/socket/qsctpserver.h index 23ffdc770da..f82ae71f168 100644 --- a/src/network/socket/qsctpserver.h +++ b/src/network/socket/qsctpserver.h @@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_SCTP) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_SCTP) || defined(Q_QDOC) class QSctpServerPrivate; class QSctpSocket; diff --git a/src/network/socket/qsctpsocket.h b/src/network/socket/qsctpsocket.h index 13279ddb4a4..8f0578ac263 100644 --- a/src/network/socket/qsctpsocket.h +++ b/src/network/socket/qsctpsocket.h @@ -9,7 +9,7 @@ QT_BEGIN_NAMESPACE -#if !defined(QT_NO_SCTP) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_SCTP) || defined(Q_QDOC) class QSctpSocketPrivate; diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index aeac92c678d..a1c610b69b7 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -21,7 +21,7 @@ public: explicit QTcpSocket(QObject *parent = nullptr); virtual ~QTcpSocket(); -#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_CLANG_QDOC) +#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_QDOC) // ### Qt7: move into QAbstractSocket using QAbstractSocket::bind; bool bind(QHostAddress::SpecialAddress addr, quint16 port = 0, BindMode mode = DefaultForPlatform) diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index 34657fffa5d..3fd1d3710a2 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -24,7 +24,7 @@ public: explicit QUdpSocket(QObject *parent = nullptr); virtual ~QUdpSocket(); -#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_CLANG_QDOC) +#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_QDOC) // ### Qt7: move into QAbstractSocket using QAbstractSocket::bind; bool bind(QHostAddress::SpecialAddress addr, quint16 port = 0, BindMode mode = DefaultForPlatform) diff --git a/src/network/ssl/qdtls.h b/src/network/ssl/qdtls.h index 903ba5b4e18..dd24aa219ad 100644 --- a/src/network/ssl/qdtls.h +++ b/src/network/ssl/qdtls.h @@ -15,7 +15,7 @@ Q_MOC_INCLUDE(<QtNetwork/QSslPreSharedKeyAuthenticator>) -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC QT_REQUIRE_CONFIG(dtls); #endif diff --git a/src/network/ssl/qocspresponse.h b/src/network/ssl/qocspresponse.h index d208edab7ac..68251a15478 100644 --- a/src/network/ssl/qocspresponse.h +++ b/src/network/ssl/qocspresponse.h @@ -11,7 +11,7 @@ #include <QtCore/qmetatype.h> #include <QtCore/qobject.h> -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC QT_REQUIRE_CONFIG(ssl); #endif diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp index 4a99fe492e7..63eaa6d092a 100644 --- a/src/network/ssl/qsslconfiguration.cpp +++ b/src/network/ssl/qsslconfiguration.cpp @@ -1098,7 +1098,7 @@ void QSslConfiguration::setDefaultConfiguration(const QSslConfiguration &configu QSslConfigurationPrivate::setDefaultConfiguration(configuration); } -#if QT_CONFIG(dtls) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(dtls) || defined(Q_QDOC) /*! This function returns true if DTLS cookie verification was enabled on a diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index 85c287bb2f4..dd2dd2a97c2 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -125,7 +125,7 @@ public: static QSslConfiguration defaultConfiguration(); static void setDefaultConfiguration(const QSslConfiguration &configuration); -#if QT_CONFIG(dtls) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(dtls) || defined(Q_QDOC) bool dtlsCookieVerificationEnabled() const; void setDtlsCookieVerificationEnabled(bool enable); diff --git a/src/opengl/qopengldebug.h b/src/opengl/qopengldebug.h index 22bf0ce2c59..843ab7212ae 100644 --- a/src/opengl/qopengldebug.h +++ b/src/opengl/qopengldebug.h @@ -15,7 +15,7 @@ #include <QtCore/qdebug.h> #include <QtGui/qopenglcontext.h> -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) #undef GLuint typedef unsigned int GLuint; #endif diff --git a/src/opengl/qopenglframebufferobject.h b/src/opengl/qopenglframebufferobject.h index bff4d8b4c0b..1701901e9d4 100644 --- a/src/opengl/qopenglframebufferobject.h +++ b/src/opengl/qopenglframebufferobject.h @@ -11,7 +11,7 @@ #include <QtCore/qscopedpointer.h> -#if defined(Q_CLANG_QDOC) +#if defined(Q_QDOC) #undef GLuint typedef unsigned int GLuint; #undef GLenum diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index e591b51aee4..c4af319c0c5 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -1272,7 +1272,7 @@ QPrinter::PrinterState QPrinter::printerState() const return d->printEngine->printerState(); } -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) /*! Returns the supported paper sizes for this printer. diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 8a3f7a45390..c60f0eea1f3 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -138,7 +138,7 @@ public: QList<int> supportedResolutions() const; -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) QList<PaperSource> supportedPaperSources() const; #endif diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 4189d30156c..7c853118560 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -50,7 +50,7 @@ public: initArgs(mo->method(sigIndex), obj); } -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template <typename PointerToMemberFunction> QSignalSpy(const QObject *object, PointerToMemberFunction signal); #else @@ -79,7 +79,7 @@ public: sig = signalMetaMethod.methodSignature(); initArgs(mo->method(sigIndex), obj); } -#endif // Q_CLANG_QDOC +#endif // Q_QDOC QSignalSpy(const QObject *obj, const QMetaMethod &signal) : m_waiting(false) diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index d68324d91ec..e748b5e0e2e 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -78,7 +78,7 @@ template<> inline char *toString(const QRegion ®ion) return qstrdup(result.constData()); } -#if !defined(QT_NO_VECTOR2D) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_VECTOR2D) || defined(Q_QDOC) template<> inline char *toString(const QVector2D &v) { QByteArray result = "QVector2D(" + QByteArray::number(double(v.x())) + ", " @@ -86,7 +86,7 @@ template<> inline char *toString(const QVector2D &v) return qstrdup(result.constData()); } #endif // !QT_NO_VECTOR2D -#if !defined(QT_NO_VECTOR3D) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_VECTOR3D) || defined(Q_QDOC) template<> inline char *toString(const QVector3D &v) { QByteArray result = "QVector3D(" + QByteArray::number(double(v.x())) + ", " @@ -94,7 +94,7 @@ template<> inline char *toString(const QVector3D &v) return qstrdup(result.constData()); } #endif // !QT_NO_VECTOR3D -#if !defined(QT_NO_VECTOR4D) || defined(Q_CLANG_QDOC) +#if !defined(QT_NO_VECTOR4D) || defined(Q_QDOC) template<> inline char *toString(const QVector4D &v) { QByteArray result = "QVector4D(" + QByteArray::number(double(v.x())) + ", " diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 4b1f290a148..71133ff3ec2 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE namespace QTest { -#if defined(QT_WIDGETS_LIB) || defined(Q_CLANG_QDOC) +#if defined(QT_WIDGETS_LIB) || defined(Q_QDOC) inline QTouchEventWidgetSequence touchEvent(QWidget *widget, QPointingDevice *device, diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp index 924f4005104..3ef7aa56f6a 100644 --- a/src/tools/qvkgen/qvkgen.cpp +++ b/src/tools/qvkgen/qvkgen.cpp @@ -331,7 +331,7 @@ bool genVulkanFunctionsH(const QList<VkSpecParser::Command> &commands, "\n" "#include <QtGui/qtguiglobal.h>\n" "\n" -"#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)\n" +"#if QT_CONFIG(vulkan) || defined(Q_QDOC)\n" "\n" "#ifndef VK_NO_PROTOTYPES\n" "#define VK_NO_PROTOTYPES\n" @@ -376,7 +376,7 @@ bool genVulkanFunctionsH(const QList<VkSpecParser::Command> &commands, "\n" "QT_END_NAMESPACE\n" "\n" -"#endif // QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)\n" +"#endif // QT_CONFIG(vulkan) || defined(Q_QDOC)\n" "\n" "#endif // QVULKANFUNCTIONS_H\n"; diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 0bd8f81fb94..4b1f5118c88 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -277,7 +277,7 @@ public: Q_SIGNALS: void buttonClicked(QAbstractButton *button); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC public Q_SLOTS: int exec() override; #endif diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 1716d8182b4..d54b65a173f 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3246,7 +3246,7 @@ void QWizard::paintEvent(QPaintEvent * event) #endif } -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) /*! \reimp */ diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index bf2364f2142..0ec973b0d2c 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -152,7 +152,7 @@ protected: bool event(QEvent *event) override; void resizeEvent(QResizeEvent *event) override; void paintEvent(QPaintEvent *event) override; -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override; #endif void done(int result) override; diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index e4bd7a8fe89..f8257b6bb2e 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -432,7 +432,7 @@ private: }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsItem::GraphicsItemFlags) -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_INTERFACE(QGraphicsItem, "org.qt-project.Qt.QGraphicsItem") #endif diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index f692507d39c..b95a6b839fe 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -47,7 +47,7 @@ private: friend class QGraphicsWidget; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_INTERFACE(QGraphicsLayout, "org.qt-project.Qt.QGraphicsLayout") #endif diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 701372d7485..43194ee7292 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -81,7 +81,7 @@ private: friend class QGraphicsLayout; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC Q_DECLARE_INTERFACE(QGraphicsLayoutItem, "org.qt-project.Qt.QGraphicsLayoutItem") #endif diff --git a/src/widgets/styles/qdrawutil.cpp b/src/widgets/styles/qdrawutil.cpp index 97507c90d5f..bfffeecb6b0 100644 --- a/src/widgets/styles/qdrawutil.cpp +++ b/src/widgets/styles/qdrawutil.cpp @@ -878,7 +878,7 @@ typedef QVarLengthArray<QPainter::PixmapFragment, 16> QPixmapFragmentsArray; void qDrawBorderPixmap(QPainter *painter, const QRect &targetRect, const QMargins &targetMargins, const QPixmap &pixmap, const QRect &sourceRect,const QMargins &sourceMargins, const QTileRules &rules -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC , QDrawBorderPixmap::DrawingHints hints #endif ) diff --git a/src/widgets/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h index 2e8cd82b3ac..2fc957d4934 100644 --- a/src/widgets/styles/qdrawutil.h +++ b/src/widgets/styles/qdrawutil.h @@ -83,7 +83,7 @@ struct QTileRules Qt::TileRule vertical; }; -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC // For internal use only. namespace QDrawBorderPixmap { @@ -115,7 +115,7 @@ Q_WIDGETS_EXPORT void qDrawBorderPixmap(QPainter *painter, const QRect &sourceRect, const QMargins &sourceMargins, const QTileRules &rules = QTileRules() -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC , QDrawBorderPixmap::DrawingHints hints = QDrawBorderPixmap::DrawingHints() #endif ); diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index b04b4a638b2..33ebd79d1f4 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -10,7 +10,7 @@ #include <QtGui/qicon.h> #include <QtGui/qaction.h> -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) Q_FORWARD_DECLARE_OBJC_CLASS(NSMenu); #endif @@ -60,7 +60,7 @@ public: const QObject *receiver, const char* member, const QKeySequence &shortcut); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename Functor> QAction *addAction(const QString &text, Functor functor, const QKeySequence &shortcut); template<typename Functor> @@ -106,7 +106,7 @@ public: { return addAction(actionIcon, text, shortcut, slot); } -#endif // !Q_CLANG_QDOC +#endif // !Q_QDOC #endif // QT_DEPRECATED_SINCE(6, 4) #endif // QT_CONFIG(shortcut) @@ -166,7 +166,7 @@ public: QPlatformMenu *platformMenu(); void setPlatformMenu(QPlatformMenu *platformMenu); -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) NSMenu* toNSMenu(); void setAsDockMenu(); #endif diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index ef78113c48f..dc0d1559bff 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -61,7 +61,7 @@ public: void setCornerWidget(QWidget *w, Qt::Corner corner = Qt::TopRightCorner); QWidget *cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const; -#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_MACOS) || defined(Q_QDOC) NSMenu* toNSMenu(); #endif diff --git a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp index 33effce1b02..c934952e962 100644 --- a/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp +++ b/tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp @@ -7,10 +7,10 @@ #include <qproperty.h> #include <private/qproperty_p.h> -#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) +#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) #include <source_location> #define QT_SOURCE_LOCATION_NAMESPACE std -#elif __has_include(<experimental/source_location>) && !defined(Q_CLANG_QDOC) +#elif __has_include(<experimental/source_location>) && !defined(Q_QDOC) #include <experimental/source_location> #define QT_SOURCE_LOCATION_NAMESPACE std::experimental #endif |