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/concurrent | |
| 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/concurrent')
| -rw-r--r-- | src/concurrent/qtconcurrentthreadengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/qtconcurrentthreadengine.cpp b/src/concurrent/qtconcurrentthreadengine.cpp index 7f91a2ba68..3293c49507 100644 --- a/src/concurrent/qtconcurrentthreadengine.cpp +++ b/src/concurrent/qtconcurrentthreadengine.cpp @@ -324,7 +324,7 @@ void ThreadEngineBase::handleException(const QException &exception) { if (futureInterface) futureInterface->reportException(exception); - else + else if (!exceptionStore.hasException()) exceptionStore.setException(exception); } #endif |