diff options
Diffstat (limited to 'src/corelib/thread/qexception.h')
| -rw-r--r-- | src/corelib/thread/qexception.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h index b14d386c69..d33904c1f2 100644 --- a/src/corelib/thread/qexception.h +++ b/src/corelib/thread/qexception.h @@ -40,10 +40,6 @@ #ifndef QTCORE_QEXCEPTION_H #define QTCORE_QEXCEPTION_H -#include <QtCore/qglobal.h> - -#ifndef QT_NO_QFUTURE - #include <QtCore/qatomic.h> #include <QtCore/qshareddata.h> @@ -51,10 +47,12 @@ # include <exception> #endif +QT_REQUIRE_CONFIG(future); + QT_BEGIN_NAMESPACE -#ifndef QT_NO_EXCEPTIONS +#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC) class Q_CORE_EXPORT QException : public std::exception { @@ -80,8 +78,8 @@ public: throw() #endif ; - void raise() const Q_DECL_OVERRIDE; - QUnhandledException *clone() const Q_DECL_OVERRIDE; + void raise() const override; + QUnhandledException *clone() const override; }; namespace QtPrivate { @@ -90,7 +88,7 @@ class Base; class Q_CORE_EXPORT ExceptionHolder { public: - ExceptionHolder(QException *exception = Q_NULLPTR); + ExceptionHolder(QException *exception = nullptr); ExceptionHolder(const ExceptionHolder &other); void operator=(const ExceptionHolder &other); // ### Qt6: copy-assign operator shouldn't return void. Remove this method and the copy-ctor, they are unneeded. ~ExceptionHolder(); @@ -128,6 +126,4 @@ public: QT_END_NAMESPACE -#endif // QT_NO_QFUTURE - #endif |