From 35878fa924d0598b1cdec5ba358e8488f6774676 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 24 Sep 2023 22:08:50 +0200 Subject: [PATCH] Long live qxp::is_virtual_base_of To be used in QWeakPointer. Change-Id: I5ee9dd0862a0b23d316aaadf5d68bef1ce609e8b Reviewed-by: Fabian Kosmale Reviewed-by: Thiago Macieira --- src/corelib/global/qxptype_traits.h | 60 +++++++++++- tests/auto/corelib/global/qxp/CMakeLists.txt | 1 + .../qxp/is_virtual_base_of/CMakeLists.txt | 16 +++ .../tst_is_virtual_base_of.cpp | 98 +++++++++++++++++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 tests/auto/corelib/global/qxp/is_virtual_base_of/CMakeLists.txt create mode 100644 tests/auto/corelib/global/qxp/is_virtual_base_of/tst_is_virtual_base_of.cpp diff --git a/src/corelib/global/qxptype_traits.h b/src/corelib/global/qxptype_traits.h index 7da0478583..d1641e1d0d 100644 --- a/src/corelib/global/qxptype_traits.h +++ b/src/corelib/global/qxptype_traits.h @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz +// Copyright (C) 2023 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz , Giuseppe D'Angelo // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only @@ -6,6 +6,7 @@ #define QXPTYPE_TRAITS_H #include +#include #include @@ -55,6 +56,63 @@ using is_detected = typename _detail::detector template