diff options
Diffstat (limited to 'src/concurrent')
-rw-r--r-- | src/concurrent/doc/qtconcurrent.qdocconf | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentiteratekernel.h | 2 | ||||
-rw-r--r-- | src/concurrent/qtconcurrentthreadengine.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf index d8ee963ef5..3cd2fac075 100644 --- a/src/concurrent/doc/qtconcurrent.qdocconf +++ b/src/concurrent/doc/qtconcurrent.qdocconf @@ -4,7 +4,7 @@ project = QtConcurrent description = Qt Concurrent Reference Documentation version = $QT_VERSION -examplesinstallpath = qtconcurrent +examplesinstallpath = qtbase/qtconcurrent qhp.projects = QtConcurrent diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index d68172e1e6..32acf03338 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -127,7 +127,7 @@ public: inline ResultReporter(ThreadEngine<void> *) { } inline void reserveSpace(int) { } inline void reportResults(int) { } - inline void * getPointer() { return 0; } + inline void * getPointer() { return Q_NULLPTR; } }; inline bool selectIteration(std::bidirectional_iterator_tag) diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index a9df3d24b5..5388f60a76 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -126,7 +126,7 @@ class ThreadEngine : public virtual ThreadEngineBase public: typedef T ResultType; - virtual T *result() { return 0; } + virtual T *result() { return Q_NULLPTR; } QFutureInterface<T> *futureInterfaceTyped() { |