summaryrefslogtreecommitdiffstats
path: root/src/corelib/compat/removed_api.cpp
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2022-06-20 16:19:24 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2022-06-22 14:32:01 +0200
commit73e1bc09e63394490d91a223b3479b46c1595d66 (patch)
tree0369aa685997f4027d45aa8d3b56a68ded868cdb /src/corelib/compat/removed_api.cpp
parentcf9cd8cc081397d08f48b6ae0d9380b11f4929dd (diff)
Move QFutureInterfaceBase::cleanContinuation() to removed_api
This method isn't used anymore, but we can't remove it entirely for BC reasons, because it was called from inline code. Pick-to: 6.4 Change-Id: I9183c666c466030787ac7c2386706b50abf23eaa Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/compat/removed_api.cpp')
-rw-r--r--src/corelib/compat/removed_api.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index 87dbe3c916..d56ea9f43a 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -169,6 +169,23 @@ QCalendar::QCalendar(QStringView name)
QCalendar::QCalendar(QLatin1StringView name)
: QCalendar(QAnyStringView{name}) {}
+#if QT_CONFIG(future)
+
+#include "qfutureinterface.h"
+#include "private/qfutureinterface_p.h"
+
+void QFutureInterfaceBase::cleanContinuation()
+{
+ if (!d)
+ return;
+
+ // This was called when the associated QPromise was being destroyed,
+ // but isn't used anymore.
+ QMutexLocker lock(&d->continuationMutex);
+ d->continuation = nullptr;
+}
+
+#endif // QT_CONFIG(future)
#include "qhashfunctions.h"