From ea3dc64d3fd2948fce3c21179dc71684647bee0e Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 13 Jun 2017 17:40:24 +0200 Subject: [PATCH] Make enums and functions exposable to QML While there is no existing API to QML, exposing connectToHost and others helps in exporting QMqttClient to QML. Change-Id: I9f71cb589be75e90e9b40d78cc32d25aa08e4f72 Reviewed-by: Maurice Kalinowski --- src/mqtt/qmqttclient.h | 7 ++++--- src/mqtt/qmqttsubscription.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mqtt/qmqttclient.h b/src/mqtt/qmqttclient.h index 1bf97fd..0c50bf7 100644 --- a/src/mqtt/qmqttclient.h +++ b/src/mqtt/qmqttclient.h @@ -53,6 +53,7 @@ public: private: Q_OBJECT + Q_ENUMS(State) 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) @@ -85,9 +86,9 @@ public: quint16 keepAlive() const; ProtocolVersion protocolVersion() const; - void connectToHost(); - void connectToHostEncrypted(const QString &sslPeerName = QString()); - void disconnectFromHost(); + Q_INVOKABLE void connectToHost(); + Q_INVOKABLE void connectToHostEncrypted(const QString &sslPeerName = QString()); + Q_INVOKABLE void disconnectFromHost(); State state() const; diff --git a/src/mqtt/qmqttsubscription.h b/src/mqtt/qmqttsubscription.h index df30269..a316aad 100644 --- a/src/mqtt/qmqttsubscription.h +++ b/src/mqtt/qmqttsubscription.h @@ -35,6 +35,7 @@ class QMqttSubscriptionPrivate; class Q_MQTT_EXPORT QMqttSubscription : public QObject { Q_OBJECT + Q_ENUMS(SubscriptionState) Q_PROPERTY(SubscriptionState state READ state WRITE setState NOTIFY stateChanged) Q_PROPERTY(quint8 qos READ qos NOTIFY qosChanged) Q_PROPERTY(QString topic READ topic)