diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-16 12:25:13 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-10-26 14:27:02 +0100 |
| commit | 4c793e6353ece51d4c04373f54e13d540b45195e (patch) | |
| tree | 6aa9367b84ec9ace22dfe6e9a2cde4172ac3a379 /src/corelib/thread/qexception.h | |
| parent | 1aa3459d0a534473582806b0988d26533bc7e16a (diff) | |
Store std::exception_ptr in QUnhandledException
For historical reasons Qt Concurrent reports QUnhandledException in
case if an exception that is not derived from QException is thrown
from a worker thread. Changing this behavior may not be a good idea,
since the existing user code may rely on it. Changed QUnhandledException
to wrap the std::exception_ptr to the actual exception, so that the
users can obtain the information about the thrown exception if needed.
[ChangeLog][QtCore][QUnhandledException] Improved QUnhandledException to
store the std::exception_ptr to the actual exception thrown from a
QtCocnurrent worker thread.
Change-Id: I30e7c1d3e01aff6e1ed9938c421da0a888f12066
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/thread/qexception.h')
| -rw-r--r-- | src/corelib/thread/qexception.h | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h index 1a21d175252..986eb43e1b3 100644 --- a/src/corelib/thread/qexception.h +++ b/src/corelib/thread/qexception.h @@ -62,12 +62,28 @@ public: virtual QException *clone() const; }; -class Q_CORE_EXPORT QUnhandledException : public QException +class QUnhandledExceptionPrivate; +class Q_CORE_EXPORT QUnhandledException final : public QException { public: - ~QUnhandledException() noexcept; + QUnhandledException(std::exception_ptr exception = nullptr) noexcept; + ~QUnhandledException() noexcept override; + + QUnhandledException(QUnhandledException &&other) noexcept; + QUnhandledException(const QUnhandledException &other) noexcept; + + void swap(QUnhandledException &other) noexcept { qSwap(d, other.d); } + + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QUnhandledException) + QUnhandledException &operator=(const QUnhandledException &other) noexcept; + void raise() const override; QUnhandledException *clone() const override; + + std::exception_ptr exception() const; + +private: + QSharedDataPointer<QUnhandledExceptionPrivate> d; }; namespace QtPrivate { |