diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-02-11 08:33:59 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-05 03:00:56 +0000 |
| commit | a19d1174f6207f2a5019c613f32601632e1c1210 (patch) | |
| tree | dc9755034db18560e8dadd45614996a6f94665c5 /src | |
| parent | acecf05f2147de0a7813b981d921fcc0d159c1f7 (diff) | |
QWeakPointer: befriend other QWeakPointers
Commit c677b3b8afcdc1d7b57353826cc01f378cd25e99 added move constructors,
which introduced the issue.
Fixes: QTBUG-100795
Change-Id: I74249c52dc02478ba93cfffd16d2c879b923e352
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 49722de99527a97373df517dcb457f3170693a4f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index b29de5f79a..1b982c0cf9 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2021 The Qt Company Ltd. -** Copyright (C) 2020 Intel Corporation. +** Copyright (C) 2022 Intel Corporation. ** Copyright (C) 2019 Klarälvdalens Datakonsult AB. ** Contact: https://www.qt.io/licensing/ ** @@ -686,6 +686,7 @@ public: private: friend struct QtPrivate::EnableInternalData; template <class X> friend class QSharedPointer; + template <class X> friend class QWeakPointer; template <class X> friend class QPointer; template <class X> |