diff options
Diffstat (limited to 'src/concurrent/qtconcurrentiteratekernel.h')
| -rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index dbd000e8ba..b543833776 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -42,7 +42,7 @@ #include <QtConcurrent/qtconcurrent_global.h> -#ifndef QT_NO_CONCURRENT +#if !defined(QT_NO_CONCURRENT) || defined(Q_CLANG_QDOC) #include <QtCore/qatomic.h> #include <QtConcurrent/qtconcurrentmedian.h> @@ -53,7 +53,6 @@ QT_BEGIN_NAMESPACE -#ifndef Q_QDOC namespace QtConcurrent { @@ -159,7 +158,7 @@ public: inline ResultReporter(ThreadEngine<void> *) { } inline void reserveSpace(int) { } inline void reportResults(int) { } - inline void * getPointer() { return Q_NULLPTR; } + inline void * getPointer() { return nullptr; } }; inline bool selectIteration(std::bidirectional_iterator_tag) @@ -323,7 +322,6 @@ public: } // namespace QtConcurrent -#endif //Q_QDOC QT_END_NAMESPACE |