Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-mqtt for openSUSE:Factory checked in at 2023-12-04 22:59:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-mqtt (Old) and /work/SRC/openSUSE:Factory/.qt6-mqtt.new.25432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-mqtt" Mon Dec 4 22:59:55 2023 rev:25 rq:1130414 version:6.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-mqtt/qt6-mqtt.changes 2023-10-13 23:14:45.555207195 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-mqtt.new.25432/qt6-mqtt.changes 2023-12-04 23:00:03.332466922 +0100 @@ -1,0 +2,6 @@ +Mon Nov 27 14:00:11 UTC 2023 - Christophe Marin <christo...@krop.fr> + +- Update to 6.6.1: + * https://www.qt.io/blog/qt-6.6.1-released + +------------------------------------------------------------------- Old: ---- qtmqtt-everywhere-src-6.6.0.tar.xz New: ---- qtmqtt-everywhere-src-6.6.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-mqtt.spec ++++++ --- /var/tmp/diff_new_pack.CKNfwS/_old 2023-12-04 23:00:04.252500779 +0100 +++ /var/tmp/diff_new_pack.CKNfwS/_new 2023-12-04 23:00:04.256500925 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.6.0 +%define real_version 6.6.1 %define short_version 6.6 %define tar_name qtmqtt-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-mqtt%{?pkg_suffix} -Version: 6.6.0 +Version: 6.6.1 Release: 0 Summary: Qt 6 Module to implement MQTT protocol version 3.1 and 3.1.1 License: GPL-3.0-only WITH Qt-GPL-exception-1.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CKNfwS/_old 2023-12-04 23:00:04.300502545 +0100 +++ /var/tmp/diff_new_pack.CKNfwS/_new 2023-12-04 23:00:04.304502692 +0100 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.6.0</param> + <param name="version">6.6.1</param> <param name="url">git://code.qt.io/qt/qtmqtt.git</param> - <param name="revision">v6.6.0</param> + <param name="revision">v6.6.1</param> <param name="scm">git</param> <param name="filename">qtmqtt-everywhere-src</param> </service> ++++++ qtmqtt-everywhere-src-6.6.0.tar.xz -> qtmqtt-everywhere-src-6.6.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/.cmake.conf new/qtmqtt-everywhere-src-6.6.1/.cmake.conf --- old/qtmqtt-everywhere-src-6.6.0/.cmake.conf 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/.cmake.conf 2023-11-20 12:56:56.000000000 +0100 @@ -1,3 +1,3 @@ -set(QT_REPO_MODULE_VERSION "6.6.0") +set(QT_REPO_MODULE_VERSION "6.6.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/dependencies.yaml new/qtmqtt-everywhere-src-6.6.1/dependencies.yaml --- old/qtmqtt-everywhere-src-6.6.0/dependencies.yaml 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/dependencies.yaml 2023-11-20 12:56:56.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 33f5e985e480283bb0ca9dea5f82643e825ba87c + ref: e2cbce919ccefcae2b18f90257d67bc6e24c3c94 required: true ../qtdeclarative: - ref: e559d5cf2b66c4a973f83f173d57676a21d287ef + ref: 30cb9f48bacdd8092b2264e6067476cafb2d7e39 required: true Binary files old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/images/quickpublication.png and new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/images/quickpublication.png differ Binary files old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/images/quicksubscription.png and new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/images/quicksubscription.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/quickpublication.qdoc new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/quickpublication.qdoc --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/quickpublication.qdoc 1970-01-01 01:00:00.000000000 +0100 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/quickpublication.qdoc 2023-11-20 12:56:56.000000000 +0100 @@ -0,0 +1,60 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \example quickpublication + \title Qt Quick Publication + \examplecategory {Connectivity} + \ingroup qtmqtt-examples + \brief Use Qt Quick Controls to create an application that can publish on MQTT + topics. + + \image quickpublication.png + + \e {Qt Quick Publication} demonstrates how to register QMqttClient as a QML type and + use it in a Qt Quick application. + + \l {Qt MQTT} does not provide a QML API in its current version. However, + you can make the C++ classes of the module available to QML. + + \section1 Creating a Client + + Create the wrapper class \c QmlMqttClient that has QMqttClient as a member: + \quotefromfile quickpublication/qmlmqttclient.h + \skipto private + \printuntil } + + Connect the wrapper methods to the methods of QMqttClient in the constructor: + \quotefromfile quickpublication/qmlmqttclient.cpp + \skipto QmlMqttClient + \printuntil } + + A wrapper method has the same name as the wrapped method. In the simplest case, + it is just a single method call: + + \skipto connectToHost + \printuntil } + + It is also possible to customize a wrapper method by extending it with some additional + functionality: + + \skipto setPort + \printuntil ); + + \section1 Registering Classes in QML + + In the \c main.cpp file, load the QML type Main from the module + publication: + + \quotefromfile quickpublication/main.cpp + \skipto (argc + \printuntil loadFromModule + + + Now use the MqttClient type in the \c Main.qml file to create an + MQTT client: + + \quotefromfile quickpublication/Main.qml + \skipto MqttClient { + \printuntil } +*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/quicksubscription.qdoc new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/quicksubscription.qdoc --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/quicksubscription.qdoc 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/quicksubscription.qdoc 2023-11-20 12:56:56.000000000 +0100 @@ -3,14 +3,15 @@ /*! \example quicksubscription - \title Quick MQTT Example + \title Qt Quick Subscription + \examplecategory {Connectivity} \ingroup qtmqtt-examples - \brief Registering QMqttClient to QML and using it in a Qt Quick user - interface. + \brief Use Qt Quick Controls to create an application that can subscribe to MQTT + topics. \image quicksubscription.png - \e {Quick MQTT} demonstrates how to register QMqttClient as a QML type and + \e {Qt Quick Subscription} demonstrates how to register QMqttClient as a QML type and use it in a Qt Quick application. \l {Qt MQTT} does not provide a QML API in its current version. However, @@ -18,23 +19,24 @@ \section1 Creating a Client - We create a \c QmlMqttClient class with the QMqttClient class as a base - class: + Connect to QMqttSubscription::messageReceived( ) to receive all messages + sent to the broker: \quotefromfile quicksubscription/qmlmqttclient.cpp - \skipto QmlMqttClient( + \skipto QmlMqttSubscription \printuntil } - We use the \c subscribe() function to create a subscription object: + Create a \c QmlMqttClient class with the QMqttClient class as a base + class: + \skipto QmlMqttClient( \printuntil } - We connect to QMqttSubscription::messageReceived( ) to receive all messages - sent to the broker: - + Use the \c subscribe() function to create a subscription object: + \skipto subscribe \printuntil } - We use an QMqttMessage object to store the payload of a received + Use a QMqttMessage object to store the payload of a received message: \skipto handleMessage @@ -42,22 +44,17 @@ \section1 Registering Classes in QML - In the \c main.cpp file, we register the \c QmlMqttClient class as a - QML type, MqttClient: + In the \c main.cpp file, load the QML type Main from the module + subscription: \quotefromfile quicksubscription/main.cpp - \skipto main(int - \printuntil qmlRegisterType - - In addition, we register the \c QmlMqttSubscription class as an uncreatable - type: - - \printuntil qmlRegisterUncreatableType + \skipto (argc + \printuntil loadFromModule - We can now use the MqttClient type in the \c main.qml file to create an + Now use the MqttClient type in the \c Main.qml file to create an MQTT client: - \quotefromfile quicksubscription/main.qml + \quotefromfile quicksubscription/Main.qml \skipto MqttClient { \printuntil } */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/simpleclient.qdoc new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/simpleclient.qdoc --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/doc/simpleclient.qdoc 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/doc/simpleclient.qdoc 2023-11-20 12:56:56.000000000 +0100 @@ -52,5 +52,5 @@ \l {MQTT Subscriptions} example. For an example of how to use the QMqttClient class in a Qt Quick - application, see \l {Quick MQTT Example}. + application, see \l {Qt Quick Subscription}. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/quickpublication/Main.qml new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/quickpublication/Main.qml --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/quickpublication/Main.qml 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/quickpublication/Main.qml 2023-11-20 12:56:56.000000000 +0100 @@ -10,7 +10,7 @@ visible: true width: 640 height: 480 - title: qsTr("Qt Quick MQTT Publish Example") + title: qsTr("Qt Quick Publication") id: root MqttClient { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/quicksubscription/Main.qml new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/quicksubscription/Main.qml --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/quicksubscription/Main.qml 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/quicksubscription/Main.qml 2023-11-20 12:56:56.000000000 +0100 @@ -1,16 +1,16 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import QtQuick 2.8 -import QtQuick.Window 2.2 -import QtQuick.Controls 2.1 -import QtQuick.Layouts 1.1 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Layouts Window { visible: true width: 640 height: 480 - title: qsTr("Qt Quick MQTT Subscription Example") + title: qsTr("Qt Quick Subscription") id: root property var tempSubscription: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/simpleclient/mainwindow.cpp new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/simpleclient/mainwindow.cpp --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/simpleclient/mainwindow.cpp 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/simpleclient/mainwindow.cpp 2023-11-20 12:56:56.000000000 +0100 @@ -8,6 +8,8 @@ #include <QtMqtt/QMqttClient> #include <QtWidgets/QMessageBox> +using namespace Qt::StringLiterals; + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -23,18 +25,17 @@ connect(m_client, &QMqttClient::messageReceived, this, [this](const QByteArray &message, const QMqttTopicName &topic) { const QString content = QDateTime::currentDateTime().toString() - + QLatin1String(" Received Topic: ") + + " Received Topic: "_L1 + topic.name() - + QLatin1String(" Message: ") + + " Message: "_L1 + message - + QLatin1Char('\n'); + + u'\n'; ui->editLog->insertPlainText(content); }); connect(m_client, &QMqttClient::pingResponseReceived, this, [this]() { const QString content = QDateTime::currentDateTime().toString() - + QLatin1String(" PingResponse") - + QLatin1Char('\n'); + + "PingResponse\n"_L1; ui->editLog->insertPlainText(content); }); @@ -71,9 +72,9 @@ void MainWindow::updateLogStateChange() { const QString content = QDateTime::currentDateTime().toString() - + QLatin1String(": State Change") + + ": State Change"_L1 + QString::number(m_client->state()) - + QLatin1Char('\n'); + + u'\n'; ui->editLog->insertPlainText(content); } @@ -92,14 +93,15 @@ void MainWindow::on_buttonPublish_clicked() { if (m_client->publish(ui->lineEditTopic->text(), ui->lineEditMessage->text().toUtf8()) == -1) - QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not publish message")); + QMessageBox::critical(this, u"Error"_s, u"Could not publish message"_s); } void MainWindow::on_buttonSubscribe_clicked() { auto subscription = m_client->subscribe(ui->lineEditTopic->text()); if (!subscription) { - QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not subscribe. Is there a valid connection?")); + QMessageBox::critical(this, u"Error"_s, + u"Could not subscribe. Is there a valid connection?"_s); return; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/subscriptions/mainwindow.cpp new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/subscriptions/mainwindow.cpp --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/subscriptions/mainwindow.cpp 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/subscriptions/mainwindow.cpp 2023-11-20 12:56:56.000000000 +0100 @@ -9,6 +9,8 @@ #include <QtMqtt/QMqttClient> #include <QtWidgets/QMessageBox> +using namespace Qt::StringLiterals; + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -24,18 +26,17 @@ connect(m_client, &QMqttClient::messageReceived, this, [this](const QByteArray &message, const QMqttTopicName &topic) { const QString content = QDateTime::currentDateTime().toString() - + QLatin1String(" Received Topic: ") + + " Received Topic: "_L1 + topic.name() - + QLatin1String(" Message: ") + + " Message: "_L1 + message - + QLatin1Char('\n'); + + u'\n'; ui->editLog->insertPlainText(content); }); connect(m_client, &QMqttClient::pingResponseReceived, this, [this]() { const QString content = QDateTime::currentDateTime().toString() - + QLatin1String(" PingResponse") - + QLatin1Char('\n'); + + " PingResponse\n"_L1; ui->editLog->insertPlainText(content); }); @@ -79,9 +80,9 @@ void MainWindow::updateLogStateChange() { const QString content = QDateTime::currentDateTime().toString() - + QLatin1String(": State Change") + + ": State Change"_L1 + QString::number(m_client->state()) - + QLatin1Char('\n'); + + u'\n'; ui->editLog->insertPlainText(content); } @@ -105,7 +106,7 @@ static_cast<quint8>(ui->spinQoS_2->text().toUInt()), ui->checkBoxRetain->isChecked()) == -1) - QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not publish message")); + QMessageBox::critical(this, u"Error"_s, u"Could not publish message"_s); } void MainWindow::on_buttonSubscribe_clicked() @@ -113,7 +114,8 @@ auto subscription = m_client->subscribe(ui->lineEditTopic->text(), static_cast<quint8>(ui->spinQoS->text().toUInt())); if (!subscription) { - QMessageBox::critical(this, QLatin1String("Error"), QLatin1String("Could not subscribe. Is there a valid connection?")); + QMessageBox::critical(this, u"Error"_s, + u"Could not subscribe. Is there a valid connection?"_s); return; } auto subWindow = new SubscriptionWindow(subscription); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/subscriptions/subscriptionwindow.cpp new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/subscriptions/subscriptionwindow.cpp --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/subscriptions/subscriptionwindow.cpp 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/subscriptions/subscriptionwindow.cpp 2023-11-20 12:56:56.000000000 +0100 @@ -4,6 +4,8 @@ #include "subscriptionwindow.h" #include "ui_subscriptionwindow.h" +using namespace Qt::StringLiterals; + SubscriptionWindow::SubscriptionWindow(QMqttSubscription *sub, QWidget *parent) : QWidget(parent), ui(new Ui::SubscriptionWindow), @@ -37,22 +39,22 @@ { switch (state) { case QMqttSubscription::Unsubscribed: - ui->labelStatus->setText(QLatin1String("Unsubscribed")); + ui->labelStatus->setText(u"Unsubscribed"_s); break; case QMqttSubscription::SubscriptionPending: - ui->labelStatus->setText(QLatin1String("Pending")); + ui->labelStatus->setText(u"Pending"_s); break; case QMqttSubscription::Subscribed: - ui->labelStatus->setText(QLatin1String("Subscribed")); + ui->labelStatus->setText(u"Subscribed"_s); break; case QMqttSubscription::Error: - ui->labelStatus->setText(QLatin1String("Error")); + ui->labelStatus->setText(u"Error"_s); break; case QMqttSubscription::UnsubscriptionPending: - ui->labelStatus->setText(QLatin1String("Pending Unsubscription")); + ui->labelStatus->setText(u"Pending Unsubscription"_s); break; default: - ui->labelStatus->setText(QLatin1String("--Unknown--")); + ui->labelStatus->setText(u"--Unknown--"_s); break; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/websocketsubscription/main.cpp new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/websocketsubscription/main.cpp --- old/qtmqtt-everywhere-src-6.6.0/examples/mqtt/websocketsubscription/main.cpp 2023-10-03 20:26:55.000000000 +0200 +++ new/qtmqtt-everywhere-src-6.6.1/examples/mqtt/websocketsubscription/main.cpp 2023-11-20 12:56:56.000000000 +0100 @@ -7,32 +7,33 @@ #include <QtCore/QCommandLineParser> #include <QtCore/QLoggingCategory> +using namespace Qt::StringLiterals; + int main(int argc, char *argv[]) { QCoreApplication a(argc, argv); QCoreApplication::setApplicationVersion("1.0"); QCommandLineParser parser; - parser.setApplicationDescription(QLatin1String("Websocket MQTT subscription tool")); + parser.setApplicationDescription(u"Websocket MQTT subscription tool"_s); auto help = parser.addHelpOption(); // Use http://www.hivemq.com/demos/websocket-client/ in browser to publish - QCommandLineOption urlOption(QStringList() << "host" << "url" << "broker", - QStringLiteral("Host to connect to, eg ws://broker.hivemq.com:8000/mqtt"), - "host"); + QCommandLineOption urlOption(QStringList{ u"host"_s, u"url"_s, u"broker"_s }, + u"Host to connect to, eg ws://broker.hivemq.com:8000/mqtt"_s, + u"host"_s); parser.addOption(urlOption); - QCommandLineOption subscriptionOption(QStringList() << "t" << "topic", - QStringLiteral("Topic to subscribe to"), "topic"); + QCommandLineOption subscriptionOption(QStringList{ u"t"_s, u"topic"_s }, + u"Topic to subscribe to"_s, u"topic"_s); parser.addOption(subscriptionOption); - QCommandLineOption debugOption(QStringList() << "d" << "debug", - QStringLiteral("Enable Debug mode")); + QCommandLineOption debugOption(QStringList{ u"d"_s, u"debug"_s }, u"Enable Debug mode"_s); parser.addOption(debugOption); - QCommandLineOption versionOption(QStringList() << "v" << "version", - QStringLiteral("MQTT protocol version.\n3: MQTT 3.1\n4: MQTT 3.1.1"), - "version", "3"); + QCommandLineOption versionOption(QStringList{ u"v"_s, u"version"_s }, + u"MQTT protocol version.\n3: MQTT 3.1\n4: MQTT 3.1.1"_s, + u"version"_s, u"3"_s); parser.addOption(versionOption); parser.process(a.arguments());
