diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-11-05 08:12:22 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@qt.io> | 2020-11-11 12:41:25 +0100 |
| commit | 5735946c279d9bc07f9fa16be025726f4855aaa0 (patch) | |
| tree | 3747f74b5cf029b2f5ee6caa9c457d4f677ffd81 | |
| parent | 00ca74ada45599639bcf5e0793bd5a3982cb2443 (diff) | |
Update dependencies on 'dev'
Also, remove optional dependency to websockets, which is not
part of Qt 6.0 and fix compile error against unsigned comparison.
Switch default test configuration to not launch TLS brokers.
Latest COIN updates causes paho to fail in the SSL setup.
Task-number: QTBUG-88189
Change-Id: I9d31f9e54801d269122878ab4cf7541512fdbe98
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | dependencies.yaml | 7 | ||||
| -rw-r--r-- | src/mqtt/qmqttpublishproperties.cpp | 2 | ||||
| -rw-r--r-- | tests/common/broker_connection.h | 10 |
3 files changed, 3 insertions, 16 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 4e2fd44..ba156ab 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,7 @@ dependencies: ../qtbase: - ref: 86d2f7f365c35f9833f3cf5c5731a8c258ad8ec4 + ref: 3c3c5778e2a1c86a8492ae635844f5b8a553a571 required: true ../qtdeclarative: - ref: 22e0701ee8baaf20a996abc3773e391687cbad70 - required: false - ../qtwebsockets: - ref: a0a81f9217a1a197b7b9a4b22edaeae221836b5b + ref: bb61349080e34f154e8b2094f4765f42b2ae8c40 required: false diff --git a/src/mqtt/qmqttpublishproperties.cpp b/src/mqtt/qmqttpublishproperties.cpp index b3372b1..8db5968 100644 --- a/src/mqtt/qmqttpublishproperties.cpp +++ b/src/mqtt/qmqttpublishproperties.cpp @@ -244,7 +244,7 @@ QList<quint32> QMqttPublishProperties::subscriptionIdentifiers() const */ void QMqttPublishProperties::setSubscriptionIdentifiers(const QList<quint32> &ids) { - if (ids.contains(0)) { + if (ids.contains(quint32(0))) { qCDebug(lcMqttClient) << "A subscription identifier with value 0 is not allowed."; return; } diff --git a/tests/common/broker_connection.h b/tests/common/broker_connection.h index 372f860..dce6df8 100644 --- a/tests/common/broker_connection.h +++ b/tests/common/broker_connection.h @@ -69,16 +69,6 @@ QString invokeOrInitializeBroker(QProcess *gBrokerProcess) QStringList arguments = {brokerLocation}; - // MQTT5 tests use the same configuration as mosquitto - const QString configuration = QLatin1String("localhost_testing.conf"); - const QDir brokerDir = QFileInfo(brokerLocation).absoluteDir(); - if (brokerDir.exists(configuration)) { - arguments << QLatin1String("-c") << QDir::toNativeSeparators(brokerDir.absoluteFilePath(configuration)); - // Configuration files use relative paths, hence the working directory of the broker - // process needs to be set correctly - gBrokerProcess->setWorkingDirectory(brokerDir.absolutePath()); - } - qDebug() << "Launching broker:" << python << arguments; gBrokerProcess->start(python, arguments); if (!gBrokerProcess->waitForStarted()) |