From 88f28bbbc3aedc824146393e6372f058cf6dcc57 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 16 Jan 2023 15:26:09 +0100 Subject: [PATCH] Q*Permission: un-Q_GADGET classes w/o Q_ENUMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can always add it back later, but for now, it's pointless overhead (no Q_PROPERTYs, no Q_INVOCABLEs). Found in API review. Change-Id: I1e30fbda997e6576a3e94cbae0387a3188c27728 Reviewed-by: Timur Pocheptsov Reviewed-by: Tor Arne Vestbø (cherry picked from commit c307cbea90a885b3981d0d7d661e19084c6134d2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qpermissions.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/kernel/qpermissions.h b/src/corelib/kernel/qpermissions.h index 7eff832446b..b911c55e87e 100644 --- a/src/corelib/kernel/qpermissions.h +++ b/src/corelib/kernel/qpermissions.h @@ -33,8 +33,6 @@ class QCoreApplication; class QPermission { - Q_GADGET_EXPORT(Q_CORE_EXPORT) - template static constexpr inline bool is_permission_v = false; @@ -75,7 +73,6 @@ private: }; #define QT_PERMISSION(ClassName) \ - Q_GADGET_EXPORT(Q_CORE_EXPORT) \ using QtPermissionHelper = void; \ friend class QPermission; \ union U { \ @@ -100,6 +97,7 @@ private: \ class QLocationPermissionPrivate; class QLocationPermission { + Q_GADGET_EXPORT(Q_CORE_EXPORT) public: enum Accuracy : quint8 { Approximate, @@ -132,6 +130,7 @@ Q_DECLARE_SHARED(QLocationPermission) class QCalendarPermissionPrivate; class QCalendarPermission { + Q_GADGET_EXPORT(Q_CORE_EXPORT) public: Q_CORE_EXPORT void setReadWrite(bool enable); Q_CORE_EXPORT bool isReadWrite() const; @@ -148,6 +147,7 @@ Q_DECLARE_SHARED(QCalendarPermission) class QContactsPermissionPrivate; class QContactsPermission { + Q_GADGET_EXPORT(Q_CORE_EXPORT) public: Q_CORE_EXPORT void setReadWrite(bool enable); Q_CORE_EXPORT bool isReadWrite() const;