diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 03:01:45 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-24 03:01:45 +0100 |
commit | b86ccb50ee7aa43463d3117dc9cd1c57ee185a60 (patch) | |
tree | da5f52dceb10ac585989c147d373a0c459c399ec | |
parent | c493980cc726de4a40782476433b463154d27700 (diff) | |
parent | fe4883441f09da29076141b636f750fb11fdb659 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia24cfcccd6d0e838aaddfacc452adba03e2e2789
-rw-r--r-- | src/mqtt/qmqttclient.h | 12 | ||||
-rw-r--r-- | src/mqtt/qmqttsubscription.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mqtt/qmqttclient.h b/src/mqtt/qmqttclient.h index 438c075..92e114b 100644 --- a/src/mqtt/qmqttclient.h +++ b/src/mqtt/qmqttclient.h @@ -161,20 +161,20 @@ Q_SIGNALS: void pingResponseReceived(); void brokerSessionRestored(); - void hostnameChanged(const QString &hostname); + void hostnameChanged(QString hostname); void portChanged(quint16 port); - void clientIdChanged(const QString &clientId); + void clientIdChanged(QString clientId); void keepAliveChanged(quint16 keepAlive); void protocolVersionChanged(ProtocolVersion protocolVersion); void stateChanged(ClientState state); void errorChanged(ClientError error); - void usernameChanged(const QString &username); - void passwordChanged(const QString &password); + void usernameChanged(QString username); + void passwordChanged(QString password); void cleanSessionChanged(bool cleanSession); - void willTopicChanged(const QString &willTopic); + void willTopicChanged(QString willTopic); void willQoSChanged(quint8 willQoS); - void willMessageChanged(const QByteArray &willMessage); + void willMessageChanged(QByteArray willMessage); void willRetainChanged(bool willRetain); void authenticationRequested(const QMqttAuthenticationProperties &p); diff --git a/src/mqtt/qmqttsubscription.h b/src/mqtt/qmqttsubscription.h index 9f8d75f..8528ad8 100644 --- a/src/mqtt/qmqttsubscription.h +++ b/src/mqtt/qmqttsubscription.h @@ -75,7 +75,7 @@ public: Q_SIGNALS: void stateChanged(SubscriptionState state); void qosChanged(quint8); // only emitted when broker provides different QoS than requested - void messageReceived(const QMqttMessage &msg); + void messageReceived(QMqttMessage msg); public Q_SLOTS: void unsubscribe(); |