1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFutureInterface: port to new SlotObjUniquePtr

Browse Source 
... removing a ### comments to that effect.

Change-Id: I635ca9593ec72a66d328ff6de61cd311c1b4e89f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 56651915e8dbb61ef6832531b6752059ec7237fc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-07-17 07:03:38 +02:00 committed by Qt Cherry-pick Bot
parent e2b8476151
commit 742dc3ff40
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/thread/qfutureinterface.cpp
View File

@ -118,11 +118,7 @@ void QtPrivate::watchContinuationImpl(const QObject *context, QSlotObjectBase *s
Q_ASSERT(context);
Q_ASSERT(slotObj);
// ### we're missing `QSlotObjectPtr`...
struct Deleter {
void operator()(QSlotObjectBase *p) const { p->destroyIfLastRef(); }
};
auto slot = std::unique_ptr<QSlotObjectBase, Deleter>(slotObj);
auto slot = SlotObjUniquePtr(slotObj);
auto *watcher = new QBasicFutureWatcher;
watcher->moveToThread(context->thread());