From 624fd64d1efa4ef5a38939bb8b8b892eb5401885 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Apr 2024 10:08:43 +0200 Subject: [PATCH] qfuture_impl.h: remove redundant declaration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtPrivate::watchContinuationImpl() is already declared in qfutureinterface.h, which qfuture_impl.h already includes. Fixes GCC -Wredundant-decls. Amends 59e21a536f7f81625216dc7a621e7be59919da33. Task-number: QTBUG-115583 Change-Id: I9c77209d2d10492f4d81aacc1f1da3201b5d1810 Reviewed-by: MÃ¥rten Nordheim Reviewed-by: Arno Rehn (cherry picked from commit 1941c11b6a633fe9a1416d7ff3e03bb5342b65da) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qfuture_impl.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/corelib/thread/qfuture_impl.h b/src/corelib/thread/qfuture_impl.h index 79fc6d9a017..62de5c06608 100644 --- a/src/corelib/thread/qfuture_impl.h +++ b/src/corelib/thread/qfuture_impl.h @@ -588,9 +588,6 @@ void Continuation::create(F &&func, f->d.setContinuation(ContinuationWrapper(std::move(continuation)), fi.d); } -// defined in qfutureinterface.cpp: -Q_CORE_EXPORT void watchContinuationImpl(const QObject *context, QSlotObjectBase *slotObj, - QFutureInterfaceBase &fi); template void watchContinuation(const QObject *context, Continuation &&c, QFutureInterfaceBase &fi) {