Merge remote-tracking branch 'origin/develop' into develop

1 files changed, 22 insertions, 0 deletions

diff --git a/async/src/future.cpp b/async/src/future.cpp
index ab02baf..50a326a 100644
--- a/async/src/future.cpp
+++ b/async/src/future.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "future.h"
+#include "async.h"
 
 using namespace Async;
 
@@ -31,6 +32,27 @@ FutureBase::~FutureBase()
 {
 }
 
+FutureBase::PrivateBase::PrivateBase(const Private::ExecutionPtr &execution)
+    : mExecution(execution)
+{
+}
+
+FutureBase::PrivateBase::~PrivateBase()
+{
+    Private::ExecutionPtr executionPtr = mExecution.toStrongRef();
+    if (executionPtr) {
+        executionPtr->releaseFuture();
+        releaseExecution();
+    }
+}
+
+void FutureBase::PrivateBase::releaseExecution()
+{
+    mExecution.clear();
+}
+
+
+
 FutureWatcherBase::FutureWatcherBase(QObject *parent)
     : QObject(parent)
 {