diff options
Diffstat (limited to 'src/corelib/thread/qexception.cpp')
| -rw-r--r-- | src/corelib/thread/qexception.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp index 62c2b608d8..a3e30d5a7a 100644 --- a/src/corelib/thread/qexception.cpp +++ b/src/corelib/thread/qexception.cpp @@ -40,8 +40,7 @@ #include "qexception.h" #include "QtCore/qshareddata.h" -#ifndef QT_NO_QFUTURE -#ifndef QT_NO_EXCEPTIONS +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) QT_BEGIN_NAMESPACE @@ -155,7 +154,7 @@ QUnhandledException *QUnhandledException::clone() const return new QUnhandledException(*this); } -#ifndef Q_QDOC +#if !defined(Q_CLANG_QDOC) namespace QtPrivate { @@ -171,7 +170,7 @@ public: }; ExceptionHolder::ExceptionHolder(QException *exception) -: base(exception ? new Base(exception) : Q_NULLPTR) {} +: base(exception ? new Base(exception) : nullptr) {} ExceptionHolder::ExceptionHolder(const ExceptionHolder &other) : base(other.base) @@ -188,7 +187,7 @@ ExceptionHolder::~ExceptionHolder() QException *ExceptionHolder::exception() const { if (!base) - return Q_NULLPTR; + return nullptr; return base->exception; } @@ -220,9 +219,8 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown; } // namespace QtPrivate -#endif //Q_QDOC +#endif //Q_CLANG_QDOC QT_END_NAMESPACE #endif // QT_NO_EXCEPTIONS -#endif // QT_NO_QFUTURE |