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>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index 9d00bc3271..92b2df7c15 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -283,6 +283,15 @@ void QFutureInterfaceBase::reportCanceled()
 #ifndef QT_NO_EXCEPTIONS
 void QFutureInterfaceBase::reportException(const QException &exception)
 {
+    try {
+        exception.raise();
+    } catch (...) {
+        reportException(std::current_exception());
+    }
+}
+
+void QFutureInterfaceBase::reportException(std::exception_ptr exception)
+{
     QMutexLocker locker(&d->m_mutex);
     if (d->state.loadRelaxed() & (Canceled|Finished))
         return;