From b0e342cbb6ec13a62752d063c2bdc1e68b0527f1 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 29 Jul 2026 07:41:12 +0300 Subject: [PATCH] Replace Q_ENUMS with Q_ENUM Amends ea3dc64d3fd2948fce3c21179dc71684647bee0e, 7467bbdc843afeee748eff38f741e2417357de7a, and ea0d792a44d7c6cbfdbeeed34b70c833a3157550 (all before 6.0). Fixes: QTBUG-148625 Pick-to: 6.8 Change-Id: I2f9b24f7e32d437cce258dfdce0d669c8d2638e1 Reviewed-by: Marc Mutz (cherry picked from commit ebd3d872931e66ecbd893c59f9989f4edc06ba5c) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 3b7642ab9bda3549910f85959ea17fd5b310f102) --- src/mqtt/qmqttclient.h | 3 --- src/mqtt/qmqttsubscription.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mqtt/qmqttclient.h b/src/mqtt/qmqttclient.h index 71d9f40..daa1ef8 100644 --- a/src/mqtt/qmqttclient.h +++ b/src/mqtt/qmqttclient.h @@ -69,9 +69,6 @@ public: private: Q_OBJECT - Q_ENUMS(ClientState) - Q_ENUMS(ClientError) - Q_ENUMS(ProtocolVersion) Q_PROPERTY(QString clientId READ clientId WRITE setClientId NOTIFY clientIdChanged) Q_PROPERTY(QString hostname READ hostname WRITE setHostname NOTIFY hostnameChanged) Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged) diff --git a/src/mqtt/qmqttsubscription.h b/src/mqtt/qmqttsubscription.h index e716224..f639fce 100644 --- a/src/mqtt/qmqttsubscription.h +++ b/src/mqtt/qmqttsubscription.h @@ -19,7 +19,6 @@ class QMqttSubscriptionPrivate; class Q_MQTT_EXPORT QMqttSubscription : public QObject { Q_OBJECT - Q_ENUMS(SubscriptionState) Q_PROPERTY(SubscriptionState state READ state NOTIFY stateChanged) Q_PROPERTY(quint8 qos READ qos NOTIFY qosChanged) Q_PROPERTY(QMqttTopicFilter topic READ topic) @@ -36,6 +35,7 @@ public: UnsubscriptionPending, Error }; + Q_ENUM(SubscriptionState) SubscriptionState state() const; QMqttTopicFilter topic() const;