diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-03-26 13:22:46 +0100 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-04-01 21:51:06 +0200 |
| commit | 495f958b9ac5c45196e743fcba300fcfd25b90a3 (patch) | |
| tree | eb24af3b1fffb770328b11dfccdfc3c783e7ff76 /src/corelib/thread/qfutureinterface.h | |
| parent | 7909de1bebe3bac32286513025fc00220cd29ec1 (diff) | |
Store QFuture exceptions as std::exception_ptr
Replaced the internal ExceptionHolder for storing QException* by
std::exception_ptr. This will allow to report and store exceptions
of types that are not derived from QException.
Task-number: QTBUG-81588
Change-Id: I96be919d8289448b3e608310e51a16cebc586301
Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/thread/qfutureinterface.h')
| -rw-r--r-- | src/corelib/thread/qfutureinterface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index 1da06beb7de..c8298d07423 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -90,6 +90,7 @@ public: void reportCanceled(); #ifndef QT_NO_EXCEPTIONS void reportException(const QException &e); + void reportException(std::exception_ptr e); #endif void reportResultsReady(int beginIndex, int endIndex); |