diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-26 13:23:55 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-11-02 15:04:46 +0100 |
commit | 5b57ce06a8178e1d62ed9a3ebea417864e263fa6 (patch) | |
tree | 33b959f38ffef3921d7ff17a317ebaae3b673fd1 /src/corelib/tools/qsharedpointer_impl.h | |
parent | 4703e07a7c4ce9e89cadb0ef1c1ef69f8ed9fb21 (diff) |
Resolve corelib's remaining ### Qt 6 comments
No action taken at Qt 6, suggesting it shall never happen.
Four removed, one converted to Qt 7, others converted to unversioned TODOs.
Filed Jira tasks, and referenced in comments, for those retained.
There remain two "once bootstrap builds are obsolete" comments and
one other on which pending action may yet happen.
Fixes: QTBUG-85700
Change-Id: Ib140a6a21c63370e51e4734cc591f67573a29d9a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/tools/qsharedpointer_impl.h')
-rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index affd85d88d..53d9a34acb 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Copyright (C) 2020 Intel Corporation. ** Copyright (C) 2019 Klarälvdalens Datakonsult AB. ** Contact: https://www.qt.io/licensing/ @@ -692,8 +692,8 @@ public: value = actual; } - // ### Qt 6: remove users of this API; no one should ever access - // a weak pointer's data but the weak pointer itself + // ### TODO - QTBUG-88102: remove all users of this API; no one should ever + // access a weak pointer's data but the weak pointer itself inline T *internalData() const noexcept { return d == nullptr || d->strongref.loadRelaxed() == 0 ? nullptr : value; @@ -889,8 +889,8 @@ qobject_cast(const QWeakPointer<T> &src) return qSharedPointerObjectCast<typename QtSharedPointer::RemovePointer<X>::Type, T>(src); } -/// ### Qt 6: make this use toStrongRef() (once support for storing -/// non-managed QObjects in QWeakPointer is removed) +/// ### TODO - QTBUG-88102: make this use toStrongRef() (once support for +/// storing non-managed QObjects in QWeakPointer is removed) template<typename T> QWeakPointer<typename std::enable_if<QtPrivate::IsPointerToTypeDerivedFromQObject<T*>::Value, T>::type> qWeakPointerFromVariant(const QVariant &variant) |