diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:05:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-09 03:05:10 +0100 |
| commit | 79d34c644c25310af8e0cb54d938e2655ebd0579 (patch) | |
| tree | ffe89dab455e469c6dfabb7853cf222650478088 | |
| parent | f5b289fbe037f52e42e1a0ce8e484cb497c3d530 (diff) | |
| parent | 4920004d5fcd10174e2e90b0853714d57b07250a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ie81ede93c36941b9fec7eac1f124f5d34615d877
| -rw-r--r-- | examples/coap/quickmulticastclient/main.qml | 2 | ||||
| -rw-r--r-- | examples/coap/quickmulticastclient/qmlcoapmulticastclient.cpp | 2 | ||||
| -rw-r--r-- | examples/coap/quickmulticastclient/qmlcoapmulticastclient.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/coap/quickmulticastclient/main.qml b/examples/coap/quickmulticastclient/main.qml index 85fc8dc..927e16f 100644 --- a/examples/coap/quickmulticastclient/main.qml +++ b/examples/coap/quickmulticastclient/main.qml @@ -72,7 +72,7 @@ Window { onDiscovered: addResource(resource) onFinished: { - statusLabel.text = (error === QtCoap.NoError) + statusLabel.text = (error === QtCoap.Error.Ok) ? qsTr("Finished resource discovery.") : qsTr("Resource discovery failed with error code: %1").arg(error) } diff --git a/examples/coap/quickmulticastclient/qmlcoapmulticastclient.cpp b/examples/coap/quickmulticastclient/qmlcoapmulticastclient.cpp index 7c868eb..af8c788 100644 --- a/examples/coap/quickmulticastclient/qmlcoapmulticastclient.cpp +++ b/examples/coap/quickmulticastclient/qmlcoapmulticastclient.cpp @@ -61,7 +61,7 @@ QmlCoapMulticastClient::QmlCoapMulticastClient(QObject *parent) connect(this, &QCoapClient::finished, this, [this](QCoapReply *reply) { if (reply) - emit finished(reply->errorReceived()); + emit finished(static_cast<int>(reply->errorReceived())); else qCWarning(lcCoapClient, "Something went wrong, received a null reply"); }); diff --git a/examples/coap/quickmulticastclient/qmlcoapmulticastclient.h b/examples/coap/quickmulticastclient/qmlcoapmulticastclient.h index 7770ade..ecb1415 100644 --- a/examples/coap/quickmulticastclient/qmlcoapmulticastclient.h +++ b/examples/coap/quickmulticastclient/qmlcoapmulticastclient.h @@ -82,7 +82,7 @@ public: Q_SIGNALS: void discovered(const QmlCoapResource &resource); - void finished(QtCoap::Error error); + void finished(int error); public slots: void onDiscovered(QCoapResourceDiscoveryReply *reply, const QVector<QCoapResource> &resources); |