1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace usages of Q_CLANG_QDOC with Q_QDOC

Browse Source 
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 <kai.koehne@qt.io>
This commit is contained in:
Luca Di Sera 2022-10-11 10:26:28 +02:00
parent 2b35b89803
commit e2fef733be
129 changed files with 293 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/concurrent/qtaskbuilder.h
View File

@ -4,13 +4,13 @@
#ifndef QTBASE_QTTASKBUILDER_H #ifndef QTBASE_QTTASKBUILDER_H
#define 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> #include <QtConcurrent/qtconcurrentstoredfunctioncall.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -126,7 +126,7 @@ private: // Data
} // namespace QtConcurrent } // namespace QtConcurrent
#endif // Q_CLANG_QDOC #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

26
src/concurrent/qtconcurrentfilter.h
View File

@ -10,7 +10,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qtconcurrentfilterkernel.h>
#include <QtConcurrent/qtconcurrentfunctionwrappers.h> #include <QtConcurrent/qtconcurrentfunctionwrappers.h>
@ -71,7 +71,7 @@ QFuture<ResultType> filteredReduced(Sequence &&sequence,
std::forward<KeepFunctor>(keep), std::forward<ReduceFunctor>(reduce), options); 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, template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -94,7 +94,7 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -116,7 +116,7 @@ QFuture<ResultType> filteredReduced(Sequence &&sequence,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor, template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0, std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
@ -213,7 +213,7 @@ QFuture<ResultType> filteredReduced(Iterator begin,
std::forward<ReduceFunctor>(reduce), options); std::forward<ReduceFunctor>(reduce), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -236,7 +236,7 @@ QFuture<ResultType> filteredReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -259,7 +259,7 @@ QFuture<ResultType> filteredReduced(Iterator begin,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor, template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
QFuture<ResultType> filteredReduced(QThreadPool *pool, QFuture<ResultType> filteredReduced(QThreadPool *pool,
@ -406,7 +406,7 @@ ResultType blockingFilteredReduced(Sequence &&sequence,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -430,7 +430,7 @@ ResultType blockingFilteredReduced(QThreadPool *pool,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Sequence, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -453,7 +453,7 @@ ResultType blockingFilteredReduced(Sequence &&sequence,
return future.takeResult(); return future.takeResult();
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Sequence, typename KeepFunctor, typename ReduceFunctor, template <typename Sequence, typename KeepFunctor, typename ReduceFunctor,
std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0, std::enable_if_t<QtPrivate::isInvocable<KeepFunctor, Sequence>::value, int> = 0,
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
@ -557,7 +557,7 @@ ResultType blockingFilteredReduced(Iterator begin,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -581,7 +581,7 @@ ResultType blockingFilteredReduced(QThreadPool *pool,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename KeepFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -604,7 +604,7 @@ ResultType blockingFilteredReduced(Iterator begin,
return future.takeResult(); return future.takeResult();
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Iterator, typename KeepFunctor, typename ReduceFunctor, template <typename Iterator, typename KeepFunctor, typename ReduceFunctor,
typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type> typename ResultType = typename QtPrivate::ReduceResultTypeHelper<ReduceFunctor>::type>
ResultType blockingFilteredReduced(QThreadPool *pool, ResultType blockingFilteredReduced(QThreadPool *pool,

2
src/concurrent/qtconcurrentfilterkernel.h
View File

@ -6,7 +6,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qtconcurrentiteratekernel.h>
#include <QtConcurrent/qtconcurrentmapkernel.h> #include <QtConcurrent/qtconcurrentmapkernel.h>

2
src/concurrent/qtconcurrentfunctionwrappers.h
View File

@ -10,7 +10,7 @@
#include <tuple> #include <tuple>
#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) #if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/concurrent/qtconcurrentiteratekernel.cpp
View File

@ -7,7 +7,7 @@
#include "private/qfunctions_p.h" #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 QT_BEGIN_NAMESPACE

2
src/concurrent/qtconcurrentiteratekernel.h
View File

@ -6,7 +6,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qatomic.h>
#include <QtConcurrent/qtconcurrentmedian.h> #include <QtConcurrent/qtconcurrentmedian.h>

34
src/concurrent/qtconcurrentmap.h
View File

@ -10,7 +10,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qtconcurrentmapkernel.h>
#include <QtConcurrent/qtconcurrentreducekernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h>
@ -75,7 +75,7 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence,
std::forward<MapFunctor>(map), std::forward<ReduceFunctor>(reduce), options); 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, template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -97,7 +97,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
std::forward<ReduceFunctor>(reduce), std::forward<ReduceFunctor>(reduce),
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -148,7 +148,7 @@ QFuture<ResultType> mappedReduced(Sequence &&sequence,
std::forward<MapFunctor>(map), std::forward<ReduceFunctor>(reduce), options); 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, template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -172,7 +172,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType, template <typename Sequence, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -223,7 +223,7 @@ QFuture<ResultType> mappedReduced(Iterator begin,
std::forward<ReduceFunctor>(reduce), options); std::forward<ReduceFunctor>(reduce), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -246,7 +246,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -298,7 +298,7 @@ QFuture<ResultType> mappedReduced(Iterator begin,
std::forward<ReduceFunctor>(reduce), options); std::forward<ReduceFunctor>(reduce), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -322,7 +322,7 @@ QFuture<ResultType> mappedReduced(QThreadPool *pool,
ResultType(std::forward<InitialValueType>(initialValue)), options); ResultType(std::forward<InitialValueType>(initialValue)), options);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -453,7 +453,7 @@ ResultType blockingMappedReduced(Sequence &&sequence,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -477,7 +477,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Sequence, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -533,7 +533,7 @@ ResultType blockingMappedReduced(Sequence &&sequence,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType, template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -558,7 +558,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType, template <typename MapFunctor, typename ReduceFunctor, typename Sequence, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -612,7 +612,7 @@ ResultType blockingMappedReduced(Iterator begin,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -637,7 +637,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor, template <typename ResultType, typename Iterator, typename MapFunctor, typename ReduceFunctor,
typename InitialValueType> typename InitialValueType>
#else #else
@ -692,7 +692,7 @@ ResultType blockingMappedReduced(Iterator begin,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else
@ -717,7 +717,7 @@ ResultType blockingMappedReduced(QThreadPool *pool,
return future.takeResult(); return future.takeResult();
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType, template <typename Iterator, typename MapFunctor, typename ReduceFunctor, typename ResultType,
typename InitialValueType> typename InitialValueType>
#else #else

2
src/concurrent/qtconcurrentmapkernel.h
View File

@ -6,7 +6,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qtconcurrentiteratekernel.h>
#include <QtConcurrent/qtconcurrentreducekernel.h> #include <QtConcurrent/qtconcurrentreducekernel.h>

2
src/concurrent/qtconcurrentmedian.h
View File

@ -6,7 +6,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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 <algorithm>
#include <cstring> #include <cstring>

6
src/concurrent/qtconcurrentreducekernel.h
View File

@ -6,7 +6,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qatomic.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
@ -40,7 +40,7 @@ namespace QtConcurrent {
MapReduce won't start any new threads, and when it exceeds MapReduce won't start any new threads, and when it exceeds
ReduceQueueThrottleLimit running threads will be stopped. ReduceQueueThrottleLimit running threads will be stopped.
*/ */
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
enum ReduceQueueLimits { enum ReduceQueueLimits {
ReduceQueueStartLimit = 20, ReduceQueueStartLimit = 20,
ReduceQueueThrottleLimit = 30 ReduceQueueThrottleLimit = 30
@ -70,7 +70,7 @@ enum ReduceOption {
// ParallelReduce = 0x8 // ParallelReduce = 0x8
}; };
Q_DECLARE_FLAGS(ReduceOptions, ReduceOption) Q_DECLARE_FLAGS(ReduceOptions, ReduceOption)
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions) Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions)
#endif #endif
// supports both ordered and out-of-order reduction // supports both ordered and out-of-order reduction

6
src/concurrent/qtconcurrentrun.h
View File

@ -10,14 +10,14 @@
#include <QtConcurrent/qtconcurrentcompilertest.h> #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/qtconcurrentrunbase.h>
#include <QtConcurrent/qtconcurrentstoredfunctioncall.h> #include <QtConcurrent/qtconcurrentstoredfunctioncall.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
typedef int Function; typedef int Function;
@ -82,7 +82,7 @@ auto run(Function &&f, Args &&...args)
} //namespace QtConcurrent } //namespace QtConcurrent
#endif // Q_CLANG_QDOC #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/concurrent/qtconcurrenttask.h
View File

@ -10,7 +10,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
namespace QtConcurrent { namespace QtConcurrent {
@ -30,7 +30,7 @@ constexpr auto task(Task &&t) { return QTaskBuilder(std::forward<Task>(t)); }
} // namespace QtConcurrent } // namespace QtConcurrent
#endif // Q_CLANG_QDOC #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/concurrent/qtconcurrentthreadengine.cpp
View File

@ -3,7 +3,7 @@
#include "qtconcurrentthreadengine.h" #include "qtconcurrentthreadengine.h"
#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) #if !defined(QT_NO_CONCURRENT) || defined(Q_QDOC)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/concurrent/qtconcurrentthreadengine.h
View File

@ -6,7 +6,7 @@
#include <QtConcurrent/qtconcurrent_global.h> #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/qthreadpool.h>
#include <QtCore/qfuture.h> #include <QtCore/qfuture.h>

4
src/corelib/global/qcompilerdetection.h
View File

@ -1040,7 +1040,7 @@
* "Weak overloads" - makes an otherwise confliciting overload weaker * "Weak overloads" - makes an otherwise confliciting overload weaker
* (by making it a template) * (by making it a template)
*/ */
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
# define Q_WEAK_OVERLOAD template <typename = void> # define Q_WEAK_OVERLOAD template <typename = void>
#else #else
# define Q_WEAK_OVERLOAD # define Q_WEAK_OVERLOAD
@ -1064,7 +1064,7 @@
* The workaround: declare such functions as function templates. * The workaround: declare such functions as function templates.
* (Obviously a function template does not need this marker.) * (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> # define QT_POST_CXX17_API_IN_EXPORTED_CLASS template <typename = void>
#else #else
# define QT_POST_CXX17_API_IN_EXPORTED_CLASS # define QT_POST_CXX17_API_IN_EXPORTED_CLASS

2
src/corelib/global/qendian.h
View File

@ -302,7 +302,7 @@ public:
static constexpr T fromSpecial(T source) { return qFromBigEndian(source); } static constexpr T fromSpecial(T source) { return qFromBigEndian(source); }
}; };
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename T> template<typename T>
class QLEInteger { class QLEInteger {
public: public:

4
src/corelib/global/qflags.h
View File

@ -24,7 +24,7 @@ public:
// Microsoft Visual Studio has buggy behavior when it comes to // Microsoft Visual Studio has buggy behavior when it comes to
// unsigned enums: even if the enum is unsigned, the enum tags are // unsigned enums: even if the enum is unsigned, the enum tags are
// always signed // 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(long value) noexcept : i(int(value)) {}
constexpr inline Q_IMPLICIT QFlag(ulong value) noexcept : i(int(long(value))) {} constexpr inline Q_IMPLICIT QFlag(ulong value) noexcept : i(int(long(value))) {}
# endif # endif
@ -57,7 +57,7 @@ class QFlags
static_assert((std::is_enum<Enum>::value), "QFlags is only usable on enumeration types."); static_assert((std::is_enum<Enum>::value), "QFlags is only usable on enumeration types.");
public: public:
#if defined(Q_CC_MSVC) || defined(Q_CLANG_QDOC) #if defined(Q_CC_MSVC) || defined(Q_QDOC)
// see above for MSVC // see above for MSVC
// the definition below is too complex for qdoc // the definition below is too complex for qdoc
typedef int Int; typedef int Int;

4
src/corelib/global/qnumeric_p.h
View File

@ -138,7 +138,7 @@ Q_DECL_CONST_FUNCTION static inline int qt_fpclassify(float f)
return qnumeric_std_wrapper::fpclassify(f); return qnumeric_std_wrapper::fpclassify(f);
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
namespace { namespace {
/*! /*!
Returns true if the double \a v can be converted to type \c T, false if 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); return qMulOverflow<V2, T>(v1, r);
} }
} }
#endif // Q_CLANG_QDOC #endif // Q_QDOC
/* /*
Safely narrows \a x to \c{To}. Let \c L be Safely narrows \a x to \c{To}. Let \c L be

2
src/corelib/global/qtversionchecks.h
View File

@ -64,7 +64,7 @@
int size() const { return int(size(QT6_CALL_NEW_OVERLOAD)); } 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
# define QT6_DECL_NEW_OVERLOAD_TAIL # define QT6_DECL_NEW_OVERLOAD_TAIL
# define QT6_IMPL_NEW_OVERLOAD # define QT6_IMPL_NEW_OVERLOAD

4
src/corelib/io/qdebug.h
View File

@ -241,7 +241,7 @@ template<typename Container, typename ...T>
using QDebugIfHasDebugStreamContainer = using QDebugIfHasDebugStreamContainer =
std::enable_if_t<std::conjunction_v<QTypeTraits::has_ostream_operator_container<QDebug, Container, T>...>, QDebug>; 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> template<typename T>
inline QDebugIfHasDebugStreamContainer<QList<T>, T> operator<<(QDebug debug, const QList<T> &vec) 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> template <typename T>
QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache); QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache);
#endif // Q_CLANG_QDOC #endif // Q_QDOC
template <class T> template <class T>
inline QDebug operator<<(QDebug debug, const QSharedPointer<T> &ptr) inline QDebug operator<<(QDebug debug, const QSharedPointer<T> &ptr)

8
src/corelib/io/qdir.h
View File

@ -66,7 +66,7 @@ public:
QDir(const QString &path = QString()); QDir(const QString &path = QString());
QDir(const QString &path, const QString &nameFilter, QDir(const QString &path, const QString &nameFilter,
SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries); 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);
QDir(const std::filesystem::path &path, const QString &nameFilter, QDir(const std::filesystem::path &path, const QString &nameFilter,
SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries); SortFlags sort = SortFlags(Name | IgnoreCase), Filters filter = AllEntries);
@ -91,7 +91,7 @@ public:
{ d_ptr.swap(other.d_ptr); } { d_ptr.swap(other.d_ptr); }
void setPath(const QString &path); void setPath(const QString &path);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
void setPath(const std::filesystem::path &path); void setPath(const std::filesystem::path &path);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -103,7 +103,7 @@ public:
QString path() const; QString path() const;
QString absolutePath() const; QString absolutePath() const;
QString canonicalPath() 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 std::filesystem::path filesystemPath() const
{ return QtPrivate::toFilesystemPath(path()); } { return QtPrivate::toFilesystemPath(path()); }
std::filesystem::path filesystemAbsolutePath() const std::filesystem::path filesystemAbsolutePath() const
@ -115,7 +115,7 @@ public:
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void setSearchPaths(const QString &prefix, const QStringList &searchPaths);
static void addSearchPath(const QString &prefix, const QString &path); 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); static void addSearchPath(const QString &prefix, const std::filesystem::path &path);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>

26
src/corelib/io/qfile.h
View File

@ -11,7 +11,7 @@
#if QT_CONFIG(cxx17_filesystem) #if QT_CONFIG(cxx17_filesystem)
#include <filesystem> #include <filesystem>
#elif defined(Q_CLANG_QDOC) #elif defined(Q_QDOC)
namespace std { namespace std {
namespace filesystem { namespace filesystem {
class path { class path {
@ -64,7 +64,7 @@ class Q_CORE_EXPORT QFile : public QFileDevice
public: public:
QFile(); QFile();
QFile(const QString &name); QFile(const QString &name);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QFile(const std::filesystem::path &name); QFile(const std::filesystem::path &name);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -77,7 +77,7 @@ public:
explicit QFile(QObject *parent); explicit QFile(QObject *parent);
QFile(const QString &name, QObject *parent); QFile(const QString &name, QObject *parent);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QFile(const std::filesystem::path &path, QObject *parent); QFile(const std::filesystem::path &path, QObject *parent);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -89,12 +89,12 @@ public:
~QFile(); ~QFile();
QString fileName() const override; 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 std::filesystem::path filesystemFileName() const
{ return QtPrivate::toFilesystemPath(fileName()); } { return QtPrivate::toFilesystemPath(fileName()); }
#endif #endif
void setFileName(const QString &name); void setFileName(const QString &name);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
void setFileName(const std::filesystem::path &name); void setFileName(const std::filesystem::path &name);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -136,7 +136,7 @@ public:
bool exists() const; bool exists() const;
static bool exists(const QString &fileName); static bool exists(const QString &fileName);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
static bool exists(const std::filesystem::path &fileName); static bool exists(const std::filesystem::path &fileName);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -148,7 +148,7 @@ public:
QString symLinkTarget() const; QString symLinkTarget() const;
static QString symLinkTarget(const QString &fileName); static QString symLinkTarget(const QString &fileName);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
std::filesystem::path filesystemSymLinkTarget() const; std::filesystem::path filesystemSymLinkTarget() const;
static std::filesystem::path filesystemSymLinkTarget(const std::filesystem::path &fileName); static std::filesystem::path filesystemSymLinkTarget(const std::filesystem::path &fileName);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
@ -165,7 +165,7 @@ public:
bool remove(); bool remove();
static bool remove(const QString &fileName); static bool remove(const QString &fileName);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
static bool remove(const std::filesystem::path &fileName); static bool remove(const std::filesystem::path &fileName);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -177,7 +177,7 @@ public:
bool moveToTrash(); bool moveToTrash();
static bool moveToTrash(const QString &fileName, QString *pathInTrash = nullptr); 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); static bool moveToTrash(const std::filesystem::path &fileName, QString *pathInTrash = nullptr);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -189,7 +189,7 @@ public:
bool rename(const QString &newName); bool rename(const QString &newName);
static bool rename(const QString &oldName, 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); bool rename(const std::filesystem::path &newName);
static bool rename(const std::filesystem::path &oldName, static bool rename(const std::filesystem::path &oldName,
const std::filesystem::path &newName); const std::filesystem::path &newName);
@ -209,7 +209,7 @@ public:
bool link(const QString &newName); bool link(const QString &newName);
static bool link(const QString &fileName, 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); bool link(const std::filesystem::path &newName);
static bool link(const std::filesystem::path &fileName, static bool link(const std::filesystem::path &fileName,
const std::filesystem::path &newName); const std::filesystem::path &newName);
@ -229,7 +229,7 @@ public:
bool copy(const QString &newName); bool copy(const QString &newName);
static bool copy(const QString &fileName, 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); bool copy(const std::filesystem::path &newName);
static bool copy(const std::filesystem::path &fileName, static bool copy(const std::filesystem::path &fileName,
const std::filesystem::path &newName); const std::filesystem::path &newName);
@ -261,7 +261,7 @@ public:
static Permissions permissions(const QString &filename); static Permissions permissions(const QString &filename);
bool setPermissions(Permissions permissionSpec) override; bool setPermissions(Permissions permissionSpec) override;
static bool setPermissions(const QString &filename, Permissions permissionSpec); static bool setPermissions(const QString &filename, Permissions permissionSpec);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
static Permissions permissions(const std::filesystem::path &filename); static Permissions permissions(const std::filesystem::path &filename);
static bool setPermissions(const std::filesystem::path &filename, Permissions permissionSpec); static bool setPermissions(const std::filesystem::path &filename, Permissions permissionSpec);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)

10
src/corelib/io/qfileinfo.h
View File

@ -34,7 +34,7 @@ public:
QFILEINFO_MAYBE_EXPLICIT QFileInfo(const QFileDevice &file); QFILEINFO_MAYBE_EXPLICIT QFileInfo(const QFileDevice &file);
QFILEINFO_MAYBE_EXPLICIT QFileInfo(const QDir &dir, const QString &file); QFILEINFO_MAYBE_EXPLICIT QFileInfo(const QDir &dir, const QString &file);
QFileInfo(const QFileInfo &fileinfo); QFileInfo(const QFileInfo &fileinfo);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QFileInfo(const std::filesystem::path &file); QFileInfo(const std::filesystem::path &file);
QFileInfo(const QDir &dir, const std::filesystem::path &file); QFileInfo(const QDir &dir, const std::filesystem::path &file);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
@ -63,7 +63,7 @@ public:
void setFile(const QString &file); void setFile(const QString &file);
void setFile(const QFileDevice &file); void setFile(const QFileDevice &file);
void setFile(const QDir &dir, const QString &file); void setFile(const QDir &dir, const QString &file);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
void setFile(const std::filesystem::path &file); void setFile(const std::filesystem::path &file);
#elif QT_CONFIG(cxx17_filesystem) #elif QT_CONFIG(cxx17_filesystem)
template<typename T, QtPrivate::ForceFilesystemPath<T> = 0> template<typename T, QtPrivate::ForceFilesystemPath<T> = 0>
@ -77,7 +77,7 @@ public:
QString filePath() const; QString filePath() const;
QString absoluteFilePath() const; QString absoluteFilePath() const;
QString canonicalFilePath() 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 std::filesystem::path filesystemFilePath() const
{ return QtPrivate::toFilesystemPath(filePath()); } { return QtPrivate::toFilesystemPath(filePath()); }
std::filesystem::path filesystemAbsoluteFilePath() const std::filesystem::path filesystemAbsoluteFilePath() const
@ -95,7 +95,7 @@ public:
QString path() const; QString path() const;
QString absolutePath() const; QString absolutePath() const;
QString canonicalPath() 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 filesystemPath() const { return QtPrivate::toFilesystemPath(path()); }
std::filesystem::path filesystemAbsolutePath() const std::filesystem::path filesystemAbsolutePath() const
{ return QtPrivate::toFilesystemPath(absolutePath()); } { return QtPrivate::toFilesystemPath(absolutePath()); }
@ -128,7 +128,7 @@ public:
QString symLinkTarget() const; QString symLinkTarget() const;
QString junctionTarget() 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 std::filesystem::path filesystemSymLinkTarget() const
{ return QtPrivate::toFilesystemPath(symLinkTarget()); } { return QtPrivate::toFilesystemPath(symLinkTarget()); }

2
src/corelib/io/qprocess.cpp
View File

@ -1476,7 +1476,7 @@ void QProcess::setStandardOutputProcess(QProcess *destination)
dto->stdinChannel.pipeFrom(dfrom); dto->stdinChannel.pipeFrom(dfrom);
} }
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
/*! /*!
\since 4.7 \since 4.7

8
src/corelib/io/qprocess.h
View File

@ -12,7 +12,7 @@
QT_REQUIRE_CONFIG(processenvironment); 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 _PROCESS_INFORMATION;
struct _SECURITY_ATTRIBUTES; struct _SECURITY_ATTRIBUTES;
struct _STARTUPINFOW; struct _STARTUPINFOW;
@ -150,7 +150,7 @@ public:
void setStandardErrorFile(const QString &fileName, OpenMode mode = Truncate); void setStandardErrorFile(const QString &fileName, OpenMode mode = Truncate);
void setStandardOutputProcess(QProcess *destination); void setStandardOutputProcess(QProcess *destination);
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
QString nativeArguments() const; QString nativeArguments() const;
void setNativeArguments(const QString &arguments); void setNativeArguments(const QString &arguments);
struct CreateProcessArguments struct CreateProcessArguments
@ -169,8 +169,8 @@ public:
typedef std::function<void(CreateProcessArguments *)> CreateProcessArgumentModifier; typedef std::function<void(CreateProcessArguments *)> CreateProcessArgumentModifier;
CreateProcessArgumentModifier createProcessArgumentsModifier() const; CreateProcessArgumentModifier createProcessArgumentsModifier() const;
void setCreateProcessArgumentsModifier(CreateProcessArgumentModifier modifier); void setCreateProcessArgumentsModifier(CreateProcessArgumentModifier modifier);
#endif // Q_OS_WIN || Q_CLANG_QDOC #endif // Q_OS_WIN || Q_QDOC
#if defined(Q_OS_UNIX) || defined(Q_CLANG_QDOC) #if defined(Q_OS_UNIX) || defined(Q_QDOC)
std::function<void(void)> childProcessModifier() const; std::function<void(void)> childProcessModifier() const;
void setChildProcessModifier(const std::function<void(void)> &modifier); void setChildProcessModifier(const std::function<void(void)> &modifier);
#endif #endif

2
src/corelib/io/qsettings.h
View File

@ -49,7 +49,7 @@ public:
NativeFormat, NativeFormat,
IniFormat, IniFormat,
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
Registry32Format, Registry32Format,
Registry64Format, Registry64Format,
#endif #endif

8
src/corelib/kernel/qcoreapplication_platform.h
View File

@ -17,13 +17,13 @@
#include <QtCore/qnativeinterface.h> #include <QtCore/qnativeinterface.h>
#include <QtCore/qcoreapplication.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> #include <QtCore/qjnitypes.h>
#if QT_CONFIG(future) && !defined(QT_NO_QOBJECT) #if QT_CONFIG(future) && !defined(QT_NO_QOBJECT)
#include <QtCore/qfuture.h> #include <QtCore/qfuture.h>
#include <QtCore/qvariant.h> #include <QtCore/qvariant.h>
#endif #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) #if defined(Q_OS_ANDROID)
class _jobject; class _jobject;
@ -38,11 +38,11 @@ Q_DECLARE_JNI_TYPE(Context, "Landroid/content/Context;")
namespace QNativeInterface namespace QNativeInterface
{ {
#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) #if defined(Q_OS_ANDROID) || defined(Q_QDOC)
struct Q_CORE_EXPORT QAndroidApplication struct Q_CORE_EXPORT QAndroidApplication
{ {
QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication) QT_DECLARE_NATIVE_INTERFACE(QAndroidApplication, 1, QCoreApplication)
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
static jobject context(); static jobject context();
#else #else
static QtJniTypes::Context context(); static QtJniTypes::Context context();

12
src/corelib/kernel/qmetaobject.h
View File

@ -136,7 +136,7 @@ public:
#endif #endif
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -150,7 +150,7 @@ public:
} }
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -161,7 +161,7 @@ public:
} }
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -172,7 +172,7 @@ public:
} }
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -183,7 +183,7 @@ public:
} }
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -196,7 +196,7 @@ public:
} }
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>

4
src/corelib/kernel/qmetatype.h
View File

@ -310,7 +310,7 @@ To convertImplicit(const From& from)
class Q_CORE_EXPORT QMetaType { class Q_CORE_EXPORT QMetaType {
public: public:
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
// The code that actually gets compiled. // The code that actually gets compiled.
enum Type { enum Type {
// these are merged with QVariant // these are merged with QVariant
@ -719,7 +719,7 @@ public:
static bool hasRegisteredMutableViewFunction(QMetaType fromType, QMetaType toType); 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::SequentialValueTypeIsMetaType;
template<typename, bool> friend struct QtPrivate::AssociativeValueTypeIsMetaType; template<typename, bool> friend struct QtPrivate::AssociativeValueTypeIsMetaType;
template<typename, bool> friend struct QtPrivate::IsMetaTypePair; template<typename, bool> friend struct QtPrivate::IsMetaTypePair;

12
src/corelib/kernel/qobject.h
View File

@ -101,7 +101,7 @@ public:
virtual bool event(QEvent *event); virtual bool event(QEvent *event);
virtual bool eventFilter(QObject *watched, 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) static QString tr(const char *sourceText, const char * = nullptr, int = -1)
{ return QString::fromUtf8(sourceText); } { return QString::fromUtf8(sourceText); }
#endif // QT_NO_TRANSLATION #endif // QT_NO_TRANSLATION
@ -188,7 +188,7 @@ public:
inline QMetaObject::Connection connect(const QObject *sender, const char *signal, inline QMetaObject::Connection connect(const QObject *sender, const char *signal,
const char *member, Qt::ConnectionType type = Qt::AutoConnection) const; const char *member, Qt::ConnectionType type = Qt::AutoConnection) const;
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename PointerToMemberFunction> template<typename PointerToMemberFunction>
static QMetaObject::Connection connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type = Qt::AutoConnection); static QMetaObject::Connection connect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method, Qt::ConnectionType type = Qt::AutoConnection);
template<typename PointerToMemberFunction, typename Functor> template<typename PointerToMemberFunction, typename Functor>
@ -311,7 +311,7 @@ public:
typename SignalType::ReturnType>(std::move(slot)), typename SignalType::ReturnType>(std::move(slot)),
type, types, &SignalType::Object::staticMetaObject); type, types, &SignalType::Object::staticMetaObject);
} }
#endif //Q_CLANG_QDOC #endif //Q_QDOC
static bool disconnect(const QObject *sender, const char *signal, static bool disconnect(const QObject *sender, const char *signal,
const QObject *receiver, const char *member); const QObject *receiver, const char *member);
@ -324,7 +324,7 @@ public:
{ return disconnect(this, nullptr, receiver, member); } { return disconnect(this, nullptr, receiver, member); }
static bool disconnect(const QMetaObject::Connection &); static bool disconnect(const QMetaObject::Connection &);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename PointerToMemberFunction> template<typename PointerToMemberFunction>
static bool disconnect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method); static bool disconnect(const QObject *sender, PointerToMemberFunction signal, const QObject *receiver, PointerToMemberFunction method);
#else #else
@ -357,7 +357,7 @@ public:
return disconnectImpl(sender, reinterpret_cast<void **>(&signal), receiver, zero, return disconnectImpl(sender, reinterpret_cast<void **>(&signal), receiver, zero,
&SignalType::Object::staticMetaObject); &SignalType::Object::staticMetaObject);
} }
#endif //Q_CLANG_QDOC #endif //Q_QDOC
void dumpObjectTree() const; void dumpObjectTree() const;
void dumpObjectInfo() const; void dumpObjectInfo() const;
@ -466,7 +466,7 @@ qobject_iid_cast(const QObject *object)
return qobject_iid_cast<std::remove_cv_t<T>>(o); 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) # define Q_DECLARE_INTERFACE(IFace, IId)
#elif !defined(Q_MOC_RUN) #elif !defined(Q_MOC_RUN)
# define Q_DECLARE_INTERFACE(IFace, IId) \ # define Q_DECLARE_INTERFACE(IFace, IId) \

14
src/corelib/kernel/qobjectdefs.h
View File

@ -233,7 +233,7 @@ struct Q_CORE_EXPORT QMetaObject
{ return const_cast<QObject *>(cast(const_cast<const QObject *>(obj))); } { return const_cast<QObject *>(cast(const_cast<const QObject *>(obj))); }
const QObject *cast(const QObject *obj) const; 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; QString tr(const char *s, const char *c, int n = -1) const;
#endif // QT_NO_TRANSLATION #endif // QT_NO_TRANSLATION
@ -355,7 +355,7 @@ struct Q_CORE_EXPORT QMetaObject
#endif // Qt < 7.0 #endif // Qt < 7.0
template <typename... Args> static template <typename... Args> static
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -369,7 +369,7 @@ struct Q_CORE_EXPORT QMetaObject
} }
template <typename... Args> static template <typename... Args> static
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -381,7 +381,7 @@ struct Q_CORE_EXPORT QMetaObject
} }
template <typename... Args> static template <typename... Args> static
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@ -393,7 +393,7 @@ struct Q_CORE_EXPORT QMetaObject
} }
template <typename... Args> static template <typename... Args> static
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
bool bool
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...> 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)...); return invokeMethod(obj, member, Qt::AutoConnection, r, std::forward<Args>(arguments)...);
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename Functor, typename FunctorReturnType> template<typename Functor, typename FunctorReturnType>
static bool invokeMethod(QObject *context, Functor function, Qt::ConnectionType type = Qt::AutoConnection, FunctorReturnType *ret = nullptr); static bool invokeMethod(QObject *context, Functor function, Qt::ConnectionType type = Qt::AutoConnection, FunctorReturnType *ret = nullptr);
template<typename Functor, typename FunctorReturnType> template<typename Functor, typename FunctorReturnType>
@ -499,7 +499,7 @@ struct Q_CORE_EXPORT QMetaObject
#endif #endif
template <typename... Args> template <typename... Args>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QObject * QObject *
#else #else
QtPrivate::Invoke::IfNotOldStyleArgs<QObject *, Args...> QtPrivate::Invoke::IfNotOldStyleArgs<QObject *, Args...>

16
src/corelib/kernel/qproperty.h
View File

@ -13,7 +13,7 @@
#include <QtCore/qpropertyprivate.h> #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> #include <source_location>
#if defined(__cpp_lib_source_location) #if defined(__cpp_lib_source_location)
#define QT_SOURCE_LOCATION_NAMESPACE std #define QT_SOURCE_LOCATION_NAMESPACE std
@ -22,7 +22,7 @@
#endif #endif
#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> #include <experimental/source_location>
#if !defined(QT_PROPERTY_COLLECT_BINDING_LOCATION) #if !defined(QT_PROPERTY_COLLECT_BINDING_LOCATION)
#if defined(__cpp_lib_experimental_source_location) #if defined(__cpp_lib_experimental_source_location)
@ -334,7 +334,7 @@ public:
explicit QProperty(const QPropertyBinding<T> &binding) explicit QProperty(const QPropertyBinding<T> &binding)
: QProperty() : QProperty()
{ setBinding(binding); } { setBinding(binding); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
explicit QProperty(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, 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) typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = nullptr)
@ -417,7 +417,7 @@ public:
return true; return true;
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
QPropertyBinding<T> setBinding(Functor &&f, QPropertyBinding<T> setBinding(Functor &&f,
const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION,
@ -759,7 +759,7 @@ public:
#endif #endif
return QPropertyBinding<T>(); return QPropertyBinding<T>();
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
QPropertyBinding<T> setBinding(Functor &&f, QPropertyBinding<T> setBinding(Functor &&f,
const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION,
@ -861,7 +861,7 @@ public:
return QBindable<T>(aliasedProperty(), iface).setBinding(newBinding); return QBindable<T>(aliasedProperty(), iface).setBinding(newBinding);
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
QPropertyBinding<T> setBinding(Functor &&f, QPropertyBinding<T> setBinding(Functor &&f,
const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION,
@ -951,7 +951,7 @@ public:
explicit QObjectBindableProperty(const QPropertyBinding<T> &binding) explicit QObjectBindableProperty(const QPropertyBinding<T> &binding)
: QObjectBindableProperty() : QObjectBindableProperty()
{ setBinding(binding); } { setBinding(binding); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
explicit QObjectBindableProperty(Functor &&f, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, 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) typename std::enable_if_t<std::is_invocable_r_v<T, Functor&>> * = nullptr)
@ -1044,7 +1044,7 @@ public:
return true; return true;
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
QPropertyBinding<T> setBinding(Functor &&f, QPropertyBinding<T> setBinding(Functor &&f,
const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION,

2
src/corelib/kernel/qproperty_p.h
View File

@ -570,7 +570,7 @@ public:
return true; return true;
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename Functor> template <typename Functor>
QPropertyBinding<T> setBinding(Functor &&f, QPropertyBinding<T> setBinding(Functor &&f,
const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION, const QPropertyBindingSourceLocation &location = QT_PROPERTY_DEFAULT_BINDING_LOCATION,

2
src/corelib/kernel/qtimer.h
View File

@ -49,7 +49,7 @@ public:
static void singleShot(int msec, const QObject *receiver, const char *member); 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); static void singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, const char *member);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename PointerToMemberFunction> template<typename PointerToMemberFunction>
static void singleShot(int msec, const QObject *receiver, PointerToMemberFunction method); static void singleShot(int msec, const QObject *receiver, PointerToMemberFunction method);
template<typename PointerToMemberFunction> template<typename PointerToMemberFunction>

2
src/corelib/kernel/qtmetamacros.h
View File

@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE
# define QT_TR_FUNCTIONS # define QT_TR_FUNCTIONS
#endif #endif
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
#define QT_TR_FUNCTIONS #define QT_TR_FUNCTIONS
#endif #endif

2
src/corelib/kernel/qvariant.h
View File

@ -429,7 +429,7 @@ public:
} }
template<typename T> template<typename T>
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
static inline auto fromValue(const T &value) static inline auto fromValue(const T &value)
noexcept(std::is_nothrow_copy_constructible_v<T> && Private::CanUseInternalSpace<T>) 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> -> std::enable_if_t<std::is_copy_constructible_v<T> && std::is_destructible_v<T>, QVariant>

2
src/corelib/kernel/qwineventnotifier.h
View File

@ -6,7 +6,7 @@
#include "QtCore/qobject.h" #include "QtCore/qobject.h"
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

2
src/corelib/plugin/qfactoryinterface.h
View File

@ -15,7 +15,7 @@ struct Q_CORE_EXPORT QFactoryInterface
virtual QStringList keys() const = 0; virtual QStringList keys() const = 0;
}; };
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
Q_DECLARE_INTERFACE(QFactoryInterface, "org.qt-project.Qt.QFactoryInterface") Q_DECLARE_INTERFACE(QFactoryInterface, "org.qt-project.Qt.QFactoryInterface")
#endif #endif

8
src/corelib/plugin/quuid.h
View File

@ -6,7 +6,7 @@
#include <QtCore/qstring.h> #include <QtCore/qstring.h>
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
#ifndef GUID_DEFINED #ifndef GUID_DEFINED
#define GUID_DEFINED #define GUID_DEFINED
typedef struct _GUID typedef struct _GUID
@ -19,7 +19,7 @@ typedef struct _GUID
#endif #endif
#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_CF_TYPE(CFUUID);
Q_FORWARD_DECLARE_OBJC_CLASS(NSUUID); Q_FORWARD_DECLARE_OBJC_CLASS(NSUUID);
#endif #endif
@ -101,7 +101,7 @@ public:
bool operator<(const QUuid &other) const noexcept; bool operator<(const QUuid &other) const noexcept;
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 // 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. // provide convenience operators to cast from and to this type.
constexpr QUuid(const GUID &guid) noexcept constexpr QUuid(const GUID &guid) noexcept
@ -151,7 +151,7 @@ public:
QUuid::Variant variant() const noexcept; QUuid::Variant variant() const noexcept;
QUuid::Version version() 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); static QUuid fromCFUUID(CFUUIDRef uuid);
CFUUIDRef toCFUUID() const Q_DECL_CF_RETURNS_RETAINED; CFUUIDRef toCFUUID() const Q_DECL_CF_RETURNS_RETAINED;
static QUuid fromNSUUID(const NSUUID *uuid); static QUuid fromNSUUID(const NSUUID *uuid);

4
src/corelib/serialization/qdatastream.h
View File

@ -404,7 +404,7 @@ typename std::enable_if_t<std::is_enum<T>::value, QDataStream &>
operator>>(QDataStream &s, T &t) operator>>(QDataStream &s, T &t)
{ return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); } { return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template<typename T> template<typename T>
inline QDataStreamIfHasIStreamOperatorsContainer<QList<T>, T> operator>>(QDataStream &s, QList<T> &v) 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> template <class T1, class T2>
QDataStream &operator<<(QDataStream& s, const std::pair<T1, T2> &p); QDataStream &operator<<(QDataStream& s, const std::pair<T1, T2> &p);
#endif // Q_CLANG_QDOC #endif // Q_QDOC
inline QDataStream &operator>>(QDataStream &s, QKeyCombination &combination) inline QDataStream &operator>>(QDataStream &s, QKeyCombination &combination)
{ {

2
src/corelib/serialization/qjsondocument.cpp
View File

@ -251,7 +251,7 @@ QVariant QJsonDocument::toVariant() const
\sa fromJson(), JsonFormat \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 QJsonDocument::toJson(JsonFormat format) const
{ {
QByteArray json; QByteArray json;

2
src/corelib/serialization/qjsondocument.h
View File

@ -80,7 +80,7 @@ public:
static QJsonDocument fromJson(const QByteArray &json, QJsonParseError *error = nullptr); 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; QByteArray toJson(JsonFormat format = Indented) const;
#endif #endif

2
src/corelib/text/qanystringview.h
View File

@ -163,7 +163,7 @@ public:
constexpr QAnyStringView(const Char *f, const Char *l) constexpr QAnyStringView(const Char *f, const Char *l)
: QAnyStringView(f, l - f) {} : QAnyStringView(f, l - f) {}
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Char, size_t N> template <typename Char, size_t N>
constexpr QAnyStringView(const Char (&array)[N]) noexcept; constexpr QAnyStringView(const Char (&array)[N]) noexcept;

2
src/corelib/text/qbytearray.h
View File

@ -173,7 +173,7 @@ public:
void truncate(qsizetype pos); void truncate(qsizetype pos);
void chop(qsizetype n); void chop(qsizetype n);
#if !defined(Q_CLANG_QDOC) #if !defined(Q_QDOC)
[[nodiscard]] QByteArray toLower() const & [[nodiscard]] QByteArray toLower() const &
{ return toLower_helper(*this); } { return toLower_helper(*this); }
[[nodiscard]] QByteArray toLower() && [[nodiscard]] QByteArray toLower() &&

6
src/corelib/text/qbytearraylist.h
View File

@ -19,7 +19,7 @@ typedef QListIterator<QByteArray> QByteArrayListIterator;
typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator;
#endif #endif
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
namespace QtPrivate { namespace QtPrivate {
#if QT_CORE_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4 #if QT_CORE_REMOVED_SINCE(6, 3) && QT_POINTER_SIZE != 4
@ -29,13 +29,13 @@ namespace QtPrivate {
} }
#endif #endif
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
class QByteArrayList : public QList<QByteArray> class QByteArrayList : public QList<QByteArray>
#else #else
template <> struct QListSpecialMethods<QByteArray> : QListSpecialMethodsBase<QByteArray> template <> struct QListSpecialMethods<QByteArray> : QListSpecialMethodsBase<QByteArray>
#endif #endif
{ {
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
protected: protected:
~QListSpecialMethods() = default; ~QListSpecialMethods() = default;
#endif #endif

2
src/corelib/text/qchar.h
View File

@ -81,7 +81,7 @@ public:
constexpr Q_IMPLICIT QChar(SpecialCharacter s) noexcept : ucs(char16_t(s)) {} 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(QLatin1Char ch) noexcept : ucs(ch.unicode()) {}
constexpr Q_IMPLICIT QChar(char16_t ch) noexcept : ucs(ch) {} 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)) {} constexpr Q_IMPLICIT QChar(wchar_t ch) noexcept : ucs(char16_t(ch)) {}
#endif #endif

12
src/corelib/text/qstring.h
View File

@ -51,7 +51,7 @@ namespace QtPrivate {
template <bool...B> class BoolList; 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 # define Q_L1S_VIEW_IS_PRIMARY
class QLatin1StringView class QLatin1StringView
#else #else
@ -443,7 +443,7 @@ public:
QString(QChar c); QString(QChar c);
QString(qsizetype size, QChar c); QString(qsizetype size, QChar c);
inline QString(QLatin1StringView latin1); inline QString(QLatin1StringView latin1);
#if defined(__cpp_char8_t) || defined(Q_CLANG_QDOC) #if defined(__cpp_char8_t) || defined(Q_QDOC)
Q_WEAK_OVERLOAD Q_WEAK_OVERLOAD
inline QString(const char8_t *str) inline QString(const char8_t *str)
: QString(fromUtf8(str)) : QString(fromUtf8(str))
@ -536,7 +536,7 @@ private:
public: public:
template <typename...Args> template <typename...Args>
[[nodiscard]] [[nodiscard]]
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QString QString
#else #else
typename std::enable_if< typename std::enable_if<
@ -646,7 +646,7 @@ public:
[[nodiscard]] QString leftJustified(qsizetype width, QChar fill = u' ', bool trunc = false) const; [[nodiscard]] QString leftJustified(qsizetype width, QChar fill = u' ', bool trunc = false) const;
[[nodiscard]] QString rightJustified(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 & [[nodiscard]] QString toLower() const &
{ return toLower_helper(*this); } { return toLower_helper(*this); }
[[nodiscard]] QString toLower() && [[nodiscard]] QString toLower() &&
@ -772,7 +772,7 @@ public:
const ushort *utf16() const; // ### Qt 7 char16_t const ushort *utf16() const; // ### Qt 7 char16_t
#if !defined(Q_CLANG_QDOC) #if !defined(Q_QDOC)
[[nodiscard]] QByteArray toLatin1() const & [[nodiscard]] QByteArray toLatin1() const &
{ return toLatin1_helper(*this); } { return toLatin1_helper(*this); }
[[nodiscard]] QByteArray toLatin1() && [[nodiscard]] QByteArray toLatin1() &&
@ -807,7 +807,7 @@ public:
{ {
return fromUtf8(QByteArrayView(utf8, !utf8 || size < 0 ? qstrlen(utf8) : size)); 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 Q_WEAK_OVERLOAD
static inline QString fromUtf8(const char8_t *str) static inline QString fromUtf8(const char8_t *str)
{ return fromUtf8(reinterpret_cast<const char *>(str)); } { return fromUtf8(reinterpret_cast<const char *>(str)); }

6
src/corelib/text/qstringfwd.h
View File

@ -26,7 +26,7 @@ QT_END_NO_CHAR8_T_NAMESPACE
class QByteArray; class QByteArray;
class QByteArrayView; 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; class QLatin1StringView;
using QLatin1String = QLatin1StringView; using QLatin1String = QLatin1StringView;
#else #else
@ -40,7 +40,7 @@ class QChar;
class QRegularExpression; class QRegularExpression;
class QRegularExpressionMatch; class QRegularExpressionMatch;
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
// ### Qt 7: remove the non-char8_t version of QUtf8StringView // ### Qt 7: remove the non-char8_t version of QUtf8StringView
QT_BEGIN_NO_CHAR8_T_NAMESPACE QT_BEGIN_NO_CHAR8_T_NAMESPACE
using QUtf8StringView = QBasicUtf8StringView<false>; using QUtf8StringView = QBasicUtf8StringView<false>;
@ -49,7 +49,7 @@ QT_END_NO_CHAR8_T_NAMESPACE
QT_BEGIN_HAS_CHAR8_T_NAMESPACE QT_BEGIN_HAS_CHAR8_T_NAMESPACE
using QUtf8StringView = QBasicUtf8StringView<true>; using QUtf8StringView = QBasicUtf8StringView<true>;
QT_END_HAS_CHAR8_T_NAMESPACE QT_END_HAS_CHAR8_T_NAMESPACE
#endif // Q_CLANG_QDOC #endif // Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

4
src/corelib/text/qstringview.h
View File

@ -150,7 +150,7 @@ public:
constexpr QStringView(const Char *f, const Char *l) constexpr QStringView(const Char *f, const Char *l)
: QStringView(f, l - f) {} : QStringView(f, l - f) {}
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Char, size_t N> template <typename Char, size_t N>
constexpr QStringView(const Char (&array)[N]) noexcept; constexpr QStringView(const Char (&array)[N]) noexcept;
@ -163,7 +163,7 @@ public:
: QStringView(str, str ? lengthHelperPointer(str) : 0) {} : QStringView(str, str ? lengthHelperPointer(str) : 0) {}
#endif #endif
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QStringView(const QString &str) noexcept; QStringView(const QString &str) noexcept;
#else #else
template <typename String, if_compatible_qstring_like<String> = true> template <typename String, if_compatible_qstring_like<String> = true>

14
src/corelib/text/qutf8stringview.h
View File

@ -83,7 +83,7 @@ struct wrap_char { using type = char; };
} // namespace QtPrivate } // namespace QtPrivate
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
#define QBasicUtf8StringView QUtf8StringView #define QBasicUtf8StringView QUtf8StringView
#else #else
template <bool UseChar8T> template <bool UseChar8T>
@ -91,7 +91,7 @@ template <bool UseChar8T>
class QBasicUtf8StringView class QBasicUtf8StringView
{ {
public: public:
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
using storage_type = typename std::conditional<UseChar8T, using storage_type = typename std::conditional<UseChar8T,
QtPrivate::hide_char8_t, QtPrivate::hide_char8_t,
QtPrivate::wrap_char QtPrivate::wrap_char
@ -162,7 +162,7 @@ public:
constexpr QBasicUtf8StringView(const Char *f, const Char *l) constexpr QBasicUtf8StringView(const Char *f, const Char *l)
: QBasicUtf8StringView(f, l - f) {} : QBasicUtf8StringView(f, l - f) {}
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template <typename Char, size_t N> template <typename Char, size_t N>
constexpr QBasicUtf8StringView(const Char (&array)[N]) noexcept; 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) {} str ? std::char_traits<std::remove_cv_t<std::remove_pointer_t<Pointer>>>::length(str) : 0) {}
#endif #endif
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QBasicUtf8StringView(const QByteArray &str) noexcept; QBasicUtf8StringView(const QByteArray &str) noexcept;
#else #else
template <typename String, if_compatible_qstring_like<String> = true> template <typename String, if_compatible_qstring_like<String> = true>
@ -200,7 +200,7 @@ public:
[[nodiscard]] constexpr qsizetype size() const noexcept { return m_size; } [[nodiscard]] constexpr qsizetype size() const noexcept { return m_size; }
[[nodiscard]] const_pointer data() const noexcept { return reinterpret_cast<const_pointer>(m_data); } [[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); } [[nodiscard]] const char8_t *utf8() const noexcept { return reinterpret_cast<const char8_t*>(m_data); }
#endif #endif
@ -321,12 +321,12 @@ private:
qsizetype m_size; qsizetype m_size;
}; };
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
#undef QBasicUtf8StringView #undef QBasicUtf8StringView
#else #else
template <bool UseChar8T> template <bool UseChar8T>
Q_DECLARE_TYPEINFO_BODY(QBasicUtf8StringView<UseChar8T>, Q_PRIMITIVE_TYPE); 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> 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 [[nodiscard]] inline q_no_char8_t::QUtf8StringView qToUtf8StringViewIgnoringNull(const QStringLike &s) noexcept

2
src/corelib/text/qvsnprintf.cpp
View File

@ -10,7 +10,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#if !defined(QT_VSNPRINTF) || defined(Q_CLANG_QDOC) #if !defined(QT_VSNPRINTF) || defined(Q_QDOC)
/*! /*!
\relates QByteArray \relates QByteArray

2
src/corelib/thread/qatomic.h
View File

@ -34,7 +34,7 @@ public:
return *this; return *this;
} }
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
T loadRelaxed() const; T loadRelaxed() const;
T loadAcquire() const; T loadAcquire() const;
void storeRelaxed(T newValue); void storeRelaxed(T newValue);

6
src/corelib/thread/qexception.cpp
View File

@ -4,7 +4,7 @@
#include "qexception.h" #include "qexception.h"
#include "QtCore/qshareddata.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 QT_BEGIN_NAMESPACE
@ -180,7 +180,7 @@ QUnhandledException *QUnhandledException::clone() const
return new QUnhandledException(*this); return new QUnhandledException(*this);
} }
#if !defined(Q_CLANG_QDOC) #if !defined(Q_QDOC)
namespace QtPrivate { namespace QtPrivate {
@ -224,7 +224,7 @@ void ExceptionStore::rethrowException() const
} // namespace QtPrivate } // namespace QtPrivate
#endif //Q_CLANG_QDOC #endif //Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/corelib/thread/qexception.h
View File

@ -16,7 +16,7 @@ QT_REQUIRE_CONFIG(future);
QT_BEGIN_NAMESPACE 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 class Q_CORE_EXPORT QException : public std::exception
{ {

8
src/corelib/thread/qfuture.h
View File

@ -55,7 +55,7 @@ public:
return *this; return *this;
} }
#if defined(Q_CLANG_QDOC) #if defined(Q_QDOC)
~QFuture() { } ~QFuture() { }
QFuture(const QFuture<T> &) { } QFuture(const QFuture<T> &) { }
QFuture<T> & operator=(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>>> template<class Function, typename = std::enable_if_t<std::is_invocable_r_v<T, Function>>>
QFuture<T> onCanceled(QObject *context, Function &&handler); 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>>> template<class U = T, typename = std::enable_if_t<QtPrivate::isQFutureV<U>>>
auto unwrap(); auto unwrap();
#else #else
@ -445,7 +445,7 @@ struct MetaTypeQFutureHelper<QFuture<T>>
namespace QtFuture { namespace QtFuture {
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template<typename OutputSequence, typename InputIt, template<typename OutputSequence, typename InputIt,
typename ValueType = typename std::iterator_traits<InputIt>::value_type, 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> template<typename... Futures>
QFuture<std::variant<std::decay_t<Futures>...>> whenAny(Futures &&... futures); QFuture<std::variant<std::decay_t<Futures>...>> whenAny(Futures &&... futures);
#endif // Q_CLANG_QDOC #endif // Q_QDOC
} // namespace QtFuture } // namespace QtFuture

2
src/corelib/thread/qfuture_impl.h
View File

@ -960,7 +960,7 @@ static QFuture<std::decay_t<T>> makeReadyFuture(T &&value)
return promise.future(); return promise.future();
} }
#if defined(Q_CLANG_QDOC) #if defined(Q_QDOC)
static QFuture<void> makeReadyFuture() static QFuture<void> makeReadyFuture()
#else #else
template<typename T = void> template<typename T = void>

6
src/corelib/thread/qmutex.h
View File

@ -17,7 +17,7 @@ class tst_QMutex;
QT_BEGIN_NAMESPACE 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 #if defined(Q_OS_LINUX) || defined(Q_OS_WIN) // these platforms use futex
# define QT_MUTEX_LOCK_NOEXCEPT noexcept # define QT_MUTEX_LOCK_NOEXCEPT noexcept
@ -289,7 +289,7 @@ private:
bool m_isLocked = false; bool m_isLocked = false;
}; };
#else // !QT_CONFIG(thread) && !Q_CLANG_QDOC #else // !QT_CONFIG(thread) && !Q_QDOC
class QMutex class QMutex
{ {
@ -339,7 +339,7 @@ private:
typedef QMutex QBasicMutex; typedef QMutex QBasicMutex;
#endif // !QT_CONFIG(thread) && !Q_CLANG_QDOC #endif // !QT_CONFIG(thread) && !Q_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/corelib/thread/qpromise.h
View File

@ -79,7 +79,7 @@ public:
d.swap(other.d); 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(const T &result, int index = -1) { }
bool addResult(T &&result, int index = -1) { } bool addResult(T &&result, int index = -1) { }
#endif #endif

2
src/corelib/thread/qthread.h
View File

@ -69,7 +69,7 @@ public:
bool event(QEvent *event) override; bool event(QEvent *event) override;
int loopLevel() const; 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> template <typename Function, typename... Args>
[[nodiscard]] static QThread *create(Function &&f, Args &&... args); [[nodiscard]] static QThread *create(Function &&f, Args &&... args);
#endif #endif

2
src/corelib/tools/qcontainerfwd.h
View File

@ -28,7 +28,7 @@ template <typename T> class QStack;
template <typename T, qsizetype Prealloc = 256> class QVarLengthArray; template <typename T, qsizetype Prealloc = 256> class QVarLengthArray;
template <typename T> class QList; template <typename T> class QList;
class QString; class QString;
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template<typename T> using QVector = QList<T>; template<typename T> using QVector = QList<T>;
using QStringList = QList<QString>; using QStringList = QList<QString>;
class QByteArray; class QByteArray;

4
src/corelib/tools/qcontiguouscache.h
View File

@ -63,7 +63,7 @@ public:
QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QContiguousCache) QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QContiguousCache)
void swap(QContiguousCache &other) noexcept { qt_ptr_swap(d, other.d); } void swap(QContiguousCache &other) noexcept { qt_ptr_swap(d, other.d); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename U = T> template <typename U = T>
QTypeTraits::compare_eq_result<U> operator==(const QContiguousCache<T> &other) const QTypeTraits::compare_eq_result<U> operator==(const QContiguousCache<T> &other) const
{ {
@ -85,7 +85,7 @@ public:
#else #else
bool operator==(const QContiguousCache &other) const; bool operator==(const QContiguousCache &other) const;
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 capacity() const {return d->alloc; }
inline qsizetype count() const { return d->count; } inline qsizetype count() const { return d->count; }

2
src/corelib/tools/qhash.cpp
View File

@ -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 /*! \relates QHash
\since 5.3 \since 5.3

8
src/corelib/tools/qhash.h
View File

@ -891,7 +891,7 @@ public:
#endif #endif
void swap(QHash &other) noexcept { qt_ptr_swap(d, other.d); } 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> template <typename AKey = Key, typename AT = T>
QTypeTraits::compare_eq_result_container<QHash, AKey, AT> operator==(const QHash &other) const noexcept QTypeTraits::compare_eq_result_container<QHash, AKey, AT> operator==(const QHash &other) const noexcept
{ {
@ -914,7 +914,7 @@ public:
#else #else
bool operator==(const QHash &other) const; bool operator==(const QHash &other) const;
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 qsizetype size() const noexcept { return d ? qsizetype(d->size) : 0; }
inline bool isEmpty() const noexcept { return !d || 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); std::swap(m_size, other.m_size);
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename AKey = Key, typename AT = T> template <typename AKey = Key, typename AT = T>
QTypeTraits::compare_eq_result_container<QMultiHash, AKey, AT> operator==(const QMultiHash &other) const noexcept QTypeTraits::compare_eq_result_container<QMultiHash, AKey, AT> operator==(const QMultiHash &other) const noexcept
{ {
@ -1479,7 +1479,7 @@ public:
#else #else
bool operator==(const QMultiHash &other) const; bool operator==(const QMultiHash &other) const;
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; } inline qsizetype size() const noexcept { return m_size; }

2
src/corelib/tools/qhashfunctions.h
View File

@ -120,7 +120,7 @@ Q_DECL_CONST_FUNCTION inline size_t qHash(float key, size_t seed = 0) noexcept
return QHashPrivate::hash(k, seed); return QHashPrivate::hash(k, seed);
} }
Q_CORE_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(double key, size_t seed = 0) noexcept; 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; Q_CORE_EXPORT Q_DECL_CONST_FUNCTION size_t qHash(long double key, size_t seed = 0) noexcept;
#endif #endif
Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(wchar_t key, size_t seed = 0) noexcept Q_DECL_CONST_FUNCTION constexpr inline size_t qHash(wchar_t key, size_t seed = 0) noexcept

4
src/corelib/tools/qlist.h
View File

@ -317,7 +317,7 @@ public:
void swap(QList &other) noexcept { d.swap(other.d); } void swap(QList &other) noexcept { d.swap(other.d); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename U = T> template <typename U = T>
QTypeTraits::compare_eq_result_container<QList, U> operator==(const QList &other) const 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; 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 size() const noexcept { return d->size; }
qsizetype count() const noexcept { return size(); } qsizetype count() const noexcept { return size(); }

8
src/corelib/tools/qmap.h
View File

@ -240,7 +240,7 @@ public:
return {}; return {};
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename AKey = Key, typename AT = T> friend template <typename AKey = Key, typename AT = T> friend
QTypeTraits::compare_eq_result_container<QMap, AKey, AT> operator==(const QMap &lhs, const QMap &rhs) QTypeTraits::compare_eq_result_container<QMap, AKey, AT> operator==(const QMap &lhs, const QMap &rhs)
{ {
@ -261,7 +261,7 @@ public:
#else #else
friend bool operator==(const QMap &lhs, const QMap &rhs); friend bool operator==(const QMap &lhs, const QMap &rhs);
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); } size_type size() const { return d ? size_type(d->m.size()) : size_type(0); }
@ -885,7 +885,7 @@ public:
return {}; return {};
} }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename AKey = Key, typename AT = T> friend template <typename AKey = Key, typename AT = T> friend
QTypeTraits::compare_eq_result_container<QMultiMap, AKey, AT> operator==(const QMultiMap &lhs, const QMultiMap &rhs) QTypeTraits::compare_eq_result_container<QMultiMap, AKey, AT> operator==(const QMultiMap &lhs, const QMultiMap &rhs)
{ {
@ -906,7 +906,7 @@ public:
#else #else
friend bool operator==(const QMultiMap &lhs, const QMultiMap &rhs); friend bool operator==(const QMultiMap &lhs, const QMultiMap &rhs);
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); } size_type size() const { return d ? size_type(d->m.size()) : size_type(0); }

2
src/corelib/tools/qset.h
View File

@ -35,7 +35,7 @@ public:
inline void swap(QSet<T> &other) noexcept { q_hash.swap(other.q_hash); } inline void swap(QSet<T> &other) noexcept { q_hash.swap(other.q_hash); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
template <typename U = T> template <typename U = T>
QTypeTraits::compare_eq_result_container<QSet, U> operator==(const QSet<T> &other) const QTypeTraits::compare_eq_result_container<QSet, U> operator==(const QSet<T> &other) const
{ return q_hash == other.q_hash; } { return q_hash == other.q_hash; }

2
src/dbus/qdbuspendingcall.h
View File

@ -29,7 +29,7 @@ public:
void swap(QDBusPendingCall &other) noexcept { d.swap(other.d); } void swap(QDBusPendingCall &other) noexcept { d.swap(other.d); }
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
// pretend that they aren't here // pretend that they aren't here
bool isFinished() const; bool isFinished() const;
void waitForFinished(); void waitForFinished();

2
src/dbus/qdbuspendingreply.h
View File

@ -81,7 +81,7 @@ public:
return qdbus_cast<ResultType>(argumentAt(Index)); return qdbus_cast<ResultType>(argumentAt(Index));
} }
#if defined(Q_CLANG_QDOC) #if defined(Q_QDOC)
bool isFinished() const; bool isFinished() const;
void waitForFinished(); void waitForFinished();
QVariant argumentAt(int index) const; QVariant argumentAt(int index) const;

2
src/gui/accessible/qaccessible.h
View File

@ -573,7 +573,7 @@ protected:
int m_lastColumn; int m_lastColumn;
}; };
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
#define QAccessibleInterface_iid "org.qt-project.Qt.QAccessibleInterface" #define QAccessibleInterface_iid "org.qt-project.Qt.QAccessibleInterface"
Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid) Q_DECLARE_INTERFACE(QAccessibleInterface, QAccessibleInterface_iid)
#endif #endif

2
src/gui/doc/includes/windows.h
View File

@ -15,7 +15,7 @@
// //
// Dummy declarations for generating docs on non-Windows platforms // 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 _FORMATETC {} FORMATETC;
typedef struct _STGMEDIUM {} STGMEDIUM; typedef struct _STGMEDIUM {} STGMEDIUM;
typedef void *IDataObject; typedef void *IDataObject;

4
src/gui/kernel/qaction.h
View File

@ -74,7 +74,7 @@ public:
QList<QObject *> associatedObjects() const; QList<QObject *> associatedObjects() const;
#if QT_DEPRECATED_SINCE(6,0) #if QT_DEPRECATED_SINCE(6,0)
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QWidget *parentWidget() const; QWidget *parentWidget() const;
QList<QWidget*> associatedWidgets() const; QList<QWidget*> associatedWidgets() const;
QList<QGraphicsWidget*> associatedGraphicsWidgets() const; QList<QGraphicsWidget*> associatedGraphicsWidgets() const;
@ -178,7 +178,7 @@ public:
void setMenuRole(MenuRole menuRole); void setMenuRole(MenuRole menuRole);
MenuRole menuRole() const; MenuRole menuRole() const;
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QMenu *menu() const; QMenu *menu() const;
void setMenu(QMenu *menu); void setMenu(QMenu *menu);
#else #else

2
src/gui/kernel/qguiapplication_p.h
View File

@ -335,7 +335,7 @@ private:
namespace QNativeInterface::Private { namespace QNativeInterface::Private {
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
class QWindowsMime; class QWindowsMime;

2
src/gui/kernel/qguiapplication_platform.h
View File

@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
namespace QNativeInterface namespace QNativeInterface
{ {
#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) #if QT_CONFIG(xcb) || defined(Q_QDOC)
struct Q_GUI_EXPORT QX11Application struct Q_GUI_EXPORT QX11Application
{ {
QT_DECLARE_NATIVE_INTERFACE(QX11Application, 1, QGuiApplication) QT_DECLARE_NATIVE_INTERFACE(QX11Application, 1, QGuiApplication)

2
src/gui/kernel/qkeymapper_p.h
View File

@ -67,7 +67,7 @@ QKeyMapperPrivate *qt_keymapper_private(); // from qkeymapper.cpp
namespace QNativeInterface::Private { namespace QNativeInterface::Private {
#if QT_CONFIG(evdev) || defined(Q_CLANG_QDOC) #if QT_CONFIG(evdev) || defined(Q_QDOC)
struct Q_GUI_EXPORT QEvdevKeyMapper struct Q_GUI_EXPORT QEvdevKeyMapper
{ {
QT_DECLARE_NATIVE_INTERFACE(QEvdevKeyMapper, 1, QKeyMapper) QT_DECLARE_NATIVE_INTERFACE(QEvdevKeyMapper, 1, QKeyMapper)

2
src/gui/kernel/qkeysequence.cpp
View File

@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
using namespace Qt::StringLiterals; 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; Q_CONSTINIT static bool qt_sequence_no_mnemonics = true;
struct MacSpecialKey { struct MacSpecialKey {
int key; int key;

6
src/gui/kernel/qkeysequence.h
View File

@ -17,12 +17,12 @@ class QKeySequence;
/***************************************************************************** /*****************************************************************************
QKeySequence stream functions 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 &in, const QKeySequence &ks);
Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks);
#endif #endif
#if defined(Q_CLANG_QDOC) #if defined(Q_QDOC)
void qt_set_sequence_auto_mnemonic(bool b); void qt_set_sequence_auto_mnemonic(bool b);
#endif #endif
@ -186,7 +186,7 @@ public:
Q_DECLARE_SHARED(QKeySequence) 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 &); Q_GUI_EXPORT QDebug operator<<(QDebug, const QKeySequence &);
#endif #endif

2
src/gui/kernel/qoffscreensurface_platform.h
View File

@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
namespace QNativeInterface { namespace QNativeInterface {
#if defined(Q_OS_ANDROID) || defined(Q_CLANG_QDOC) #if defined(Q_OS_ANDROID) || defined(Q_QDOC)
struct Q_GUI_EXPORT QAndroidOffscreenSurface struct Q_GUI_EXPORT QAndroidOffscreenSurface
{ {
QT_DECLARE_NATIVE_INTERFACE(QAndroidOffscreenSurface, 1, QOffscreenSurface) QT_DECLARE_NATIVE_INTERFACE(QAndroidOffscreenSurface, 1, QOffscreenSurface)

10
src/gui/kernel/qopenglcontext_platform.h
View File

@ -34,7 +34,7 @@ typedef void *EGLDisplay;
typedef void *EGLConfig; typedef void *EGLConfig;
#endif #endif
#if !defined(Q_OS_MACOS) && defined(Q_CLANG_QDOC) #if !defined(Q_OS_MACOS) && defined(Q_QDOC)
typedef void *NSOpenGLContext; typedef void *NSOpenGLContext;
#endif #endif
@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE
namespace QNativeInterface { namespace QNativeInterface {
#if defined(Q_OS_MACOS) || defined(Q_CLANG_QDOC) #if defined(Q_OS_MACOS) || defined(Q_QDOC)
struct Q_GUI_EXPORT QCocoaGLContext struct Q_GUI_EXPORT QCocoaGLContext
{ {
QT_DECLARE_NATIVE_INTERFACE(QCocoaGLContext, 1, QOpenGLContext) QT_DECLARE_NATIVE_INTERFACE(QCocoaGLContext, 1, QOpenGLContext)
@ -51,7 +51,7 @@ struct Q_GUI_EXPORT QCocoaGLContext
}; };
#endif #endif
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
struct Q_GUI_EXPORT QWGLContext struct Q_GUI_EXPORT QWGLContext
{ {
QT_DECLARE_NATIVE_INTERFACE(QWGLContext, 1, QOpenGLContext) QT_DECLARE_NATIVE_INTERFACE(QWGLContext, 1, QOpenGLContext)
@ -61,7 +61,7 @@ struct Q_GUI_EXPORT QWGLContext
}; };
#endif #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 struct Q_GUI_EXPORT QGLXContext
{ {
QT_DECLARE_NATIVE_INTERFACE(QGLXContext, 1, QOpenGLContext) QT_DECLARE_NATIVE_INTERFACE(QGLXContext, 1, QOpenGLContext)
@ -71,7 +71,7 @@ struct Q_GUI_EXPORT QGLXContext
}; };
#endif #endif
#if QT_CONFIG(egl) || defined(Q_CLANG_QDOC) #if QT_CONFIG(egl) || defined(Q_QDOC)
struct Q_GUI_EXPORT QEGLContext struct Q_GUI_EXPORT QEGLContext
{ {
QT_DECLARE_NATIVE_INTERFACE(QEGLContext, 1, QOpenGLContext) QT_DECLARE_NATIVE_INTERFACE(QEGLContext, 1, QOpenGLContext)

2
src/gui/kernel/qplatformintegration.cpp
View File

@ -569,7 +569,7 @@ void QPlatformIntegration::setApplicationIcon(const QIcon &icon) const
Q_UNUSED(icon); 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 Factory function for QPlatformVulkanInstance. The \a instance parameter is a

2
src/gui/kernel/qplatformintegration.h
View File

@ -192,7 +192,7 @@ public:
virtual void beep() const; virtual void beep() const;
virtual void quit() 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; virtual QPlatformVulkanInstance *createPlatformVulkanInstance(QVulkanInstance *instance) const;
#endif #endif

4
src/gui/kernel/qplatformmenu_p.h
View File

@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
// ----------------- QNativeInterface ----------------- // ----------------- QNativeInterface -----------------
#if !defined(Q_OS_MACOS) && defined(Q_CLANG_QDOC) #if !defined(Q_OS_MACOS) && defined(Q_QDOC)
typedef void NSMenu; typedef void NSMenu;
#else #else
QT_END_NAMESPACE QT_END_NAMESPACE
@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE
namespace QNativeInterface::Private { 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 struct Q_GUI_EXPORT QCocoaMenu
{ {
QT_DECLARE_NATIVE_INTERFACE(QCocoaMenu) QT_DECLARE_NATIVE_INTERFACE(QCocoaMenu)

8
src/gui/kernel/qplatformscreen_p.h
View File

@ -38,7 +38,7 @@ public:
namespace QNativeInterface::Private { namespace QNativeInterface::Private {
#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) #if QT_CONFIG(xcb) || defined(Q_QDOC)
struct Q_GUI_EXPORT QXcbScreen struct Q_GUI_EXPORT QXcbScreen
{ {
QT_DECLARE_NATIVE_INTERFACE(QXcbScreen, 1, QScreen) QT_DECLARE_NATIVE_INTERFACE(QXcbScreen, 1, QScreen)
@ -46,7 +46,7 @@ struct Q_GUI_EXPORT QXcbScreen
}; };
#endif #endif
#if QT_CONFIG(vsp2) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vsp2) || defined(Q_QDOC)
struct Q_GUI_EXPORT QVsp2Screen struct Q_GUI_EXPORT QVsp2Screen
{ {
QT_DECLARE_NATIVE_INTERFACE(QVsp2Screen, 1, QScreen) QT_DECLARE_NATIVE_INTERFACE(QVsp2Screen, 1, QScreen)
@ -59,7 +59,7 @@ struct Q_GUI_EXPORT QVsp2Screen
}; };
#endif #endif
#if defined(Q_OS_WEBOS) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WEBOS) || defined(Q_QDOC)
struct Q_GUI_EXPORT QWebOSScreen struct Q_GUI_EXPORT QWebOSScreen
{ {
QT_DECLARE_NATIVE_INTERFACE(QWebOSScreen, 1, QScreen) QT_DECLARE_NATIVE_INTERFACE(QWebOSScreen, 1, QScreen)
@ -72,7 +72,7 @@ struct Q_GUI_EXPORT QWebOSScreen
}; };
#endif #endif
#if defined(Q_OS_WIN32) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN32) || defined(Q_QDOC)
struct Q_GUI_EXPORT QWindowsScreen struct Q_GUI_EXPORT QWindowsScreen
{ {
QT_DECLARE_NATIVE_INTERFACE(QWindowsScreen, 1, QScreen) QT_DECLARE_NATIVE_INTERFACE(QWindowsScreen, 1, QScreen)

6
src/gui/kernel/qplatformwindow_p.h
View File

@ -35,7 +35,7 @@ public:
namespace QNativeInterface::Private { 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 struct Q_GUI_EXPORT QCocoaWindow
{ {
QT_DECLARE_NATIVE_INTERFACE(QCocoaWindow, 1, QWindow) QT_DECLARE_NATIVE_INTERFACE(QCocoaWindow, 1, QWindow)
@ -44,7 +44,7 @@ struct Q_GUI_EXPORT QCocoaWindow
}; };
#endif #endif
#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) #if QT_CONFIG(xcb) || defined(Q_QDOC)
struct Q_GUI_EXPORT QXcbWindow struct Q_GUI_EXPORT QXcbWindow
{ {
QT_DECLARE_NATIVE_INTERFACE(QXcbWindow, 1, QWindow) QT_DECLARE_NATIVE_INTERFACE(QXcbWindow, 1, QWindow)
@ -76,7 +76,7 @@ struct Q_GUI_EXPORT QXcbWindow
}; };
#endif // xcb #endif // xcb
#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) #if defined(Q_OS_WIN) || defined(Q_QDOC)
struct Q_GUI_EXPORT QWindowsWindow struct Q_GUI_EXPORT QWindowsWindow
{ {
QT_DECLARE_NATIVE_INTERFACE(QWindowsWindow, 1, QWindow) QT_DECLARE_NATIVE_INTERFACE(QWindowsWindow, 1, QWindow)

4
src/gui/kernel/qshortcut.h
View File

@ -32,7 +32,7 @@ public:
const char *member = nullptr, const char *ambiguousMember = nullptr, const char *member = nullptr, const char *ambiguousMember = nullptr,
Qt::ShortcutContext context = Qt::WindowShortcut); Qt::ShortcutContext context = Qt::WindowShortcut);
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename Functor> template<typename Functor>
QShortcut(const QKeySequence &key, QObject *parent, QShortcut(const QKeySequence &key, QObject *parent,
Functor functor, Functor functor,
@ -177,7 +177,7 @@ public:
QString whatsThis() const; QString whatsThis() const;
#if QT_DEPRECATED_SINCE(6,0) #if QT_DEPRECATED_SINCE(6,0)
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
QWidget *parentWidget() const; QWidget *parentWidget() const;
#else #else
template<typename T = QWidget*> template<typename T = QWidget*>

2
src/gui/kernel/qwindow.cpp
View File

@ -3071,7 +3071,7 @@ QDebug operator<<(QDebug debug, const QWindow *window)
} }
#endif // !QT_NO_DEBUG_STREAM #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. Associates this window with the specified Vulkan \a instance.

4
src/gui/kernel/qwindow.h
View File

@ -55,7 +55,7 @@ class QWindowContainer;
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
class QDebug; class QDebug;
#endif #endif
#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vulkan) || defined(Q_QDOC)
class QVulkanInstance; class QVulkanInstance;
#endif #endif
@ -248,7 +248,7 @@ public:
static QWindow *fromWinId(WId id); static QWindow *fromWinId(WId id);
#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vulkan) || defined(Q_QDOC)
void setVulkanInstance(QVulkanInstance *instance); void setVulkanInstance(QVulkanInstance *instance);
QVulkanInstance *vulkanInstance() const; QVulkanInstance *vulkanInstance() const;
#endif #endif

2
src/gui/opengl/qopenglfunctions.h
View File

@ -191,7 +191,7 @@ struct QOpenGLFunctionsPrivate;
#undef glTexLevelParameteriv #undef glTexLevelParameteriv
#if defined(Q_CLANG_QDOC) #if defined(Q_QDOC)
#undef GLbitfield #undef GLbitfield
typedef unsigned int GLbitfield; typedef unsigned int GLbitfield;
#undef GLchar #undef GLchar

2
src/gui/painting/qregion.cpp
View File

@ -636,7 +636,7 @@ bool QRegion::intersects(const QRegion &region) 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 \overload
\since 4.4 \since 4.4

2
src/gui/painting/qt_mips_asm_dsp_p.h
View File

@ -19,7 +19,7 @@
#pragma qt_sync_stop_processing #pragma qt_sync_stop_processing
#endif #endif
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
#define zero $0 #define zero $0
#define AT $1 #define AT $1
#define v0 $2 #define v0 $2

2
src/gui/text/qabstracttextdocumentlayout.h
View File

@ -107,7 +107,7 @@ public:
virtual void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) = 0; 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") Q_DECLARE_INTERFACE(QTextObjectInterface, "org.qt-project.Qt.QTextObjectInterface")
#endif #endif

10
src/gui/vulkan/qplatformvulkaninstance.h
View File

@ -15,7 +15,7 @@
#include <QtGui/qtguiglobal.h> #include <QtGui/qtguiglobal.h>
#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vulkan) || defined(Q_QDOC)
#include <qvulkaninstance.h> #include <qvulkaninstance.h>
@ -56,7 +56,7 @@ QT_END_NAMESPACE
#endif // QT_CONFIG(vulkan) #endif // QT_CONFIG(vulkan)
#if defined(Q_CLANG_QDOC) #if defined(Q_QDOC)
/* /*
The following include file did not exist for clang-qdoc running The following include file did not exist for clang-qdoc running
in macOS, but the classes are documented in qvulkanfunctions.cpp. in macOS, but the classes are documented in qvulkanfunctions.cpp.
@ -70,7 +70,7 @@ QT_END_NAMESPACE
#include <QtGui/qtguiglobal.h> #include <QtGui/qtguiglobal.h>
#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vulkan) || defined(Q_QDOC)
#ifndef VK_NO_PROTOTYPES #ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
@ -113,8 +113,8 @@ private:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #endif // QT_CONFIG(vulkan) || defined(Q_QDOC)
#endif // QVULKANFUNCTIONS_H; #endif // QVULKANFUNCTIONS_H;
#endif // Q_CLANG_QDOC #endif // Q_QDOC
#endif // QPLATFORMVULKANINSTANCE_H #endif // QPLATFORMVULKANINSTANCE_H

10
src/gui/vulkan/qvulkaninstance.h
View File

@ -11,12 +11,12 @@
#pragma qt_sync_skip_header_check #pragma qt_sync_skip_header_check
#endif #endif
#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vulkan) || defined(Q_QDOC)
#ifndef VK_NO_PROTOTYPES #ifndef VK_NO_PROTOTYPES
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
#endif #endif
#if !defined(Q_CLANG_QDOC) && __has_include(<vulkan/vulkan.h>) #if !defined(Q_QDOC) && __has_include(<vulkan/vulkan.h>)
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#else #else
// QT_CONFIG(vulkan) implies vulkan.h being available at Qt build time, but it // 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 // 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 // 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*. // 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/qbytearraylist.h>
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>
@ -219,8 +219,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QVulkanInstance::DebugMessageSeverityFlags)
QT_END_NAMESPACE 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 #endif // QVULKANINSTANCE_H

2
src/gui/vulkan/qvulkaninstance_p.h
View File

@ -6,7 +6,7 @@
#include <QtGui/private/qtguiglobal_p.h> #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 "qvulkaninstance.h"
#include <private/qvulkanfunctions_p.h> #include <private/qvulkanfunctions_p.h>

4
src/gui/vulkan/qvulkanwindow.h
View File

@ -11,7 +11,7 @@
#pragma qt_sync_skip_header_check #pragma qt_sync_skip_header_check
#endif #endif
#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) #if QT_CONFIG(vulkan) || defined(Q_QDOC)
#include <QtGui/qvulkaninstance.h> #include <QtGui/qvulkaninstance.h>
#include <QtGui/qwindow.h> #include <QtGui/qwindow.h>
@ -19,7 +19,7 @@
#include <QtGui/qmatrix4x4.h> #include <QtGui/qmatrix4x4.h>
#include <QtCore/qset.h> #include <QtCore/qset.h>
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
typedef void* VkQueue; typedef void* VkQueue;
typedef void* VkCommandPool; typedef void* VkCommandPool;
typedef void* VkRenderPass; typedef void* VkRenderPass;

2
src/gui/vulkan/qvulkanwindow_p.h
View File

@ -6,7 +6,7 @@
#include <QtGui/private/qtguiglobal_p.h> #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 "qvulkanwindow.h"
#include <QtCore/QHash> #include <QtCore/QHash>

2
src/network/access/qhttp2configuration.h
View File

@ -8,7 +8,7 @@
#include <QtCore/qshareddata.h> #include <QtCore/qshareddata.h>
#ifndef Q_CLANG_QDOC #ifndef Q_QDOC
QT_REQUIRE_CONFIG(http); QT_REQUIRE_CONFIG(http);
#endif #endif

10
src/network/access/qnetworkrequest.cpp
View File

@ -6,7 +6,7 @@
#include "qplatformdefs.h" #include "qplatformdefs.h"
#include "qnetworkcookie.h" #include "qnetworkcookie.h"
#include "qsslconfiguration.h" #include "qsslconfiguration.h"
#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) #if QT_CONFIG(http) || defined(Q_QDOC)
#include "qhttp2configuration.h" #include "qhttp2configuration.h"
#include "private/http2protocol_p.h" #include "private/http2protocol_p.h"
#endif #endif
@ -852,7 +852,7 @@ void QNetworkRequest::setPeerVerifyName(const QString &peerName)
d->peerVerifyName = peerName; d->peerVerifyName = peerName;
} }
#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) #if QT_CONFIG(http) || defined(Q_QDOC)
/*! /*!
\since 5.14 \since 5.14
@ -938,9 +938,9 @@ void QNetworkRequest::setDecompressedSafetyCheckThreshold(qint64 threshold)
{ {
d->decompressedSafetyCheckThreshold = 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 \since 5.15
@ -974,7 +974,7 @@ void QNetworkRequest::setTransferTimeout(int timeout)
{ {
d->transferTimeout = 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) static QByteArray headerName(QNetworkRequest::KnownHeaders header)
{ {

8
src/network/access/qnetworkrequest.h
View File

@ -143,18 +143,18 @@ public:
QString peerVerifyName() const; QString peerVerifyName() const;
void setPeerVerifyName(const QString &peerName); void setPeerVerifyName(const QString &peerName);
#if QT_CONFIG(http) || defined(Q_CLANG_QDOC) #if QT_CONFIG(http) || defined(Q_QDOC)
QHttp2Configuration http2Configuration() const; QHttp2Configuration http2Configuration() const;
void setHttp2Configuration(const QHttp2Configuration &configuration); void setHttp2Configuration(const QHttp2Configuration &configuration);
qint64 decompressedSafetyCheckThreshold() const; qint64 decompressedSafetyCheckThreshold() const;
void setDecompressedSafetyCheckThreshold(qint64 threshold); 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; int transferTimeout() const;
void setTransferTimeout(int timeout = DefaultTransferTimeoutConstant); 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: private:
QSharedDataPointer<QNetworkRequestPrivate> d; QSharedDataPointer<QNetworkRequestPrivate> d;
friend class QNetworkRequestPrivate; friend class QNetworkRequestPrivate;

2
src/network/kernel/qhostinfo.h
View File

@ -55,7 +55,7 @@ public:
static QString localHostName(); static QString localHostName();
static QString localDomainName(); static QString localDomainName();
#ifdef Q_CLANG_QDOC #ifdef Q_QDOC
template<typename Functor> template<typename Functor>
static int lookupHost(const QString &name, Functor functor); static int lookupHost(const QString &name, Functor functor);
template<typename Functor> template<typename Functor>

Some files were not shown because too many files have changed in this diff Show More