diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-02-02 14:34:54 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-02-03 00:48:20 +0100 |
commit | 216af5d7f9675a408e22167b097f221beeeb88db (patch) | |
tree | 805a858795c1e968e76fed311492b8da249ba82a /src/corelib/kernel/qpropertyprivate.h | |
parent | 4b64df56509dd770002ec083ee64f3ec23a8b682 (diff) |
Fix usage of std::enable_if_t to SFINAE out QProperty APIs
Declare an IfUntypedPropertyData alias and use that consistently.
Amends 311f8896322bcd39d33369c8311a8c89ccdad449.
Pick-to: 6.7
Change-Id: If36ef8e2f9ce25e0ffe7b4b448c31ea5866acfc3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/kernel/qpropertyprivate.h')
-rw-r--r-- | src/corelib/kernel/qpropertyprivate.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/corelib/kernel/qpropertyprivate.h b/src/corelib/kernel/qpropertyprivate.h index fa8fe04d5d..28cc04ff9d 100644 --- a/src/corelib/kernel/qpropertyprivate.h +++ b/src/corelib/kernel/qpropertyprivate.h @@ -124,16 +124,13 @@ struct QPropertyObserverPointer; class QUntypedPropertyData { -public: -#if QT_DEPRECATED_SINCE(6, 8) - // sentinel to check whether a class inherits QUntypedPropertyData - struct QT_DEPRECATED_VERSION_X_6_8("Use std::is_base_of instead.") - InheritsQUntypedPropertyData - { - }; -#endif }; +namespace QtPrivate { +template <typename T> +using IsUntypedPropertyData = std::enable_if_t<std::is_base_of_v<QUntypedPropertyData, T>, bool>; +} + template <typename T> class QPropertyData; |