summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qfutureinterface.cpp
diff options
context:
space:
mode:
authorQt CI Bot <qt_ci_bot@qt-project.org>2021-03-22 15:19:48 +0000
committerQt CI Bot <qt_ci_bot@qt-project.org>2021-03-22 15:19:48 +0000
commitb4afffd6a27f56a164fdbe482fa76fe915a45fd0 (patch)
tree53099e5695f83d0554b348c59818e4befd2647f2 /src/corelib/thread/qfutureinterface.cpp
parentb3544bfd4642c3b256c39d20bc58a9019d3e4d25 (diff)
parente07aec7eaa40361b685f35dd75b9f668f28364b7 (diff)
Merge integration refs/builds/qtci/dev/1616406519
Diffstat (limited to 'src/corelib/thread/qfutureinterface.cpp')
-rw-r--r--src/corelib/thread/qfutureinterface.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp
index 7a8ba081030..4e9d557209a 100644
--- a/src/corelib/thread/qfutureinterface.cpp
+++ b/src/corelib/thread/qfutureinterface.cpp
@@ -600,6 +600,11 @@ void QFutureInterfaceBase::reset()
d->isValid = false;
}
+void QFutureInterfaceBase::rethrowPossibleException()
+{
+ exceptionStore().throwPossibleException();
+}
+
QFutureInterfaceBasePrivate::QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState)
: refCount(1), m_progressValue(0), m_progressMinimum(0), m_progressMaximum(0),
state(initialState),