Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: I7e8a509e3939b973f9055cd45c7a3b6351905e2c

6 files changed, 18 insertions, 50 deletions

diff --git a/examples/mqtt/simpleclient/mainwindow.cpp b/examples/mqtt/simpleclient/mainwindow.cpp
index e40820b..dcf344c 100644
--- a/examples/mqtt/simpleclient/mainwindow.cpp
+++ b/examples/mqtt/simpleclient/mainwindow.cpp
@@ -79,7 +79,6 @@ MainWindow::MainWindow(QWidget *parent) :
     });
 
     connect(m_client, &QMqttClient::pingResponseReceived, this, [this]() {
-        ui->buttonPing->setEnabled(true);
         const QString content = QDateTime::currentDateTime().toString()
                     + QLatin1String(" PingResponse")
                     + QLatin1Char('\n');
@@ -151,9 +150,3 @@ void MainWindow::on_buttonSubscribe_clicked()
         return;
     }
 }
-
-void MainWindow::on_buttonPing_clicked()
-{
-    ui->buttonPing->setEnabled(false);
-    m_client->requestPing();
-}
diff --git a/examples/mqtt/simpleclient/mainwindow.h b/examples/mqtt/simpleclient/mainwindow.h
index 05e048f..601dafd 100644
--- a/examples/mqtt/simpleclient/mainwindow.h
+++ b/examples/mqtt/simpleclient/mainwindow.h
@@ -65,7 +65,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 public slots:
@@ -82,8 +82,6 @@ private slots:
 
     void on_buttonSubscribe_clicked();
 
-    void on_buttonPing_clicked();
-
 private:
     Ui::MainWindow *ui;
     QMqttClient *m_client;
diff --git a/examples/mqtt/simpleclient/mainwindow.ui b/examples/mqtt/simpleclient/mainwindow.ui
index 4e4f6ce..564dc79 100644
--- a/examples/mqtt/simpleclient/mainwindow.ui
+++ b/examples/mqtt/simpleclient/mainwindow.ui
@@ -63,17 +63,10 @@
     </item>
     <item>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="lineEditTopic">
-        <property name="text">
-         <string>qtmqtt/topic1</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_3">
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="lineEditMessage">
         <property name="text">
-         <string>Topic:</string>
+         <string>This is a test message</string>
         </property>
        </widget>
       </item>
@@ -84,31 +77,31 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QPushButton" name="buttonPublish">
+      <item row="0" column="2">
+       <widget class="QPushButton" name="buttonSubscribe">
         <property name="text">
-         <string>Publish</string>
+         <string>Subscribe</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="buttonSubscribe">
+      <item row="1" column="2">
+       <widget class="QPushButton" name="buttonPublish">
         <property name="text">
-         <string>Subscribe</string>
+         <string>Publish</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1">
-       <widget class="QLineEdit" name="lineEditMessage">
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="lineEditTopic">
         <property name="text">
-         <string>This is a test message</string>
+         <string>qtmqtt/topic1</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="2">
-       <widget class="QPushButton" name="buttonPing">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_3">
         <property name="text">
-         <string>Ping</string>
+         <string>Topic:</string>
         </property>
        </widget>
       </item>
@@ -158,7 +151,7 @@
      <x>0</x>
      <y>0</y>
      <width>1024</width>
-     <height>21</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
diff --git a/examples/mqtt/subscriptions/mainwindow.cpp b/examples/mqtt/subscriptions/mainwindow.cpp
index e75483f..9bb2c76 100644
--- a/examples/mqtt/subscriptions/mainwindow.cpp
+++ b/examples/mqtt/subscriptions/mainwindow.cpp
@@ -80,7 +80,6 @@ MainWindow::MainWindow(QWidget *parent) :
     });
 
     connect(m_client, &QMqttClient::pingResponseReceived, this, [this]() {
-        ui->buttonPing->setEnabled(true);
         const QString content = QDateTime::currentDateTime().toString()
                     + QLatin1String(" PingResponse")
                     + QLatin1Char('\n');
@@ -167,9 +166,3 @@ void MainWindow::on_buttonSubscribe_clicked()
     subWindow->setWindowTitle(subscription->topic().filter());
     subWindow->show();
 }
-
-void MainWindow::on_buttonPing_clicked()
-{
-    ui->buttonPing->setEnabled(false);
-    m_client->requestPing();
-}
diff --git a/examples/mqtt/subscriptions/mainwindow.h b/examples/mqtt/subscriptions/mainwindow.h
index de10ee3..05447fb 100644
--- a/examples/mqtt/subscriptions/mainwindow.h
+++ b/examples/mqtt/subscriptions/mainwindow.h
@@ -66,7 +66,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0);
+    explicit MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
 public slots:
@@ -83,8 +83,6 @@ private slots:
 
     void on_buttonSubscribe_clicked();
 
-    void on_buttonPing_clicked();
-
 private:
     Ui::MainWindow *ui;
     QMqttClient *m_client;
diff --git a/examples/mqtt/subscriptions/mainwindow.ui b/examples/mqtt/subscriptions/mainwindow.ui
index 0b627aa..07cbf3f 100644
--- a/examples/mqtt/subscriptions/mainwindow.ui
+++ b/examples/mqtt/subscriptions/mainwindow.ui
@@ -37,13 +37,6 @@
            </property>
           </widget>
          </item>
-         <item row="1" column="2">
-          <widget class="QPushButton" name="buttonPing">
-           <property name="text">
-            <string>Ping</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="text">