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

 Conflicts:
	.qmake.conf

Change-Id: Id9db3547396bd82b170db8c3025e5060d4cbba3e

3 files changed, 53 insertions, 0 deletions

diff --git a/dist/changes-5.14.0 b/dist/changes-5.14.0
new file mode 100644
index 0000000..01bc30b
--- /dev/null
+++ b/dist/changes-5.14.0
@@ -0,0 +1,24 @@
+Qt 5.14 introduces many new features and improvements as well as bugfixes
+over the 5.13.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.14 series is binary compatible with the 5.13.x series.
+Applications compiled for 5.13 will continue to run with 5.14.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               QMqttClient                                *
+****************************************************************************
+
+ - [QTBUG-73378] Added secure connection with QSslConfiguration
+ - [QTBUG-76783] Added support for empty last will messages
+ - Introduce autoKeepAlive property
diff --git a/examples/mqtt/consolepubsub/consolepubsub.pro b/examples/mqtt/consolepubsub/consolepubsub.pro
index 6aee476..6d19954 100644
--- a/examples/mqtt/consolepubsub/consolepubsub.pro
+++ b/examples/mqtt/consolepubsub/consolepubsub.pro
@@ -4,3 +4,5 @@ SUBDIRS = \
     qtmqtt_pub.pro \
     qtmqtt_sub.pro
 
+CONFIG += ordered
+
diff --git a/src/mqtt/qmqttpublishproperties.cpp b/src/mqtt/qmqttpublishproperties.cpp
index 77e2118..b3372b1 100644
--- a/src/mqtt/qmqttpublishproperties.cpp
+++ b/src/mqtt/qmqttpublishproperties.cpp
@@ -269,6 +269,24 @@ void QMqttPublishProperties::setContentType(const QString &type)
     data->contentType = type;
 }
 
+/*!
+    \class QMqttMessageStatusProperties
+
+    \inmodule QtMqtt
+    \since 5.12
+
+    \brief The QMqttMessageStatusProperties class represents additional
+    information provided by the server during message delivery.
+
+    Depending on the QoS level of a message being sent by QMqttClient::publish(),
+    a server reports the state of delivery. Additionally to the QMqtt::MessageStatus,
+    complementary information might be included by the server. These are exposed to
+    users via QMqttMessageStatusProperties.
+
+    \note Message status properties are part of the MQTT 5.0 specification and
+    cannot be used when connecting with a lower protocol level. See
+    QMqttClient::ProtocolVersion for more information.
+*/
 QMqttMessageStatusProperties::QMqttMessageStatusProperties() : data(new QMqttMessageStatusPropertiesData)
 {
 
@@ -281,16 +299,25 @@ QMqttMessageStatusProperties &QMqttMessageStatusProperties::operator=(const QMqt
     return *this;
 }
 
+/*!
+    Returns the reason code of a failed message delivery.
+*/
 QMqtt::ReasonCode QMqttMessageStatusProperties::reasonCode() const
 {
     return data->reasonCode;
 }
 
+/*!
+    Returns the reason string of a failed message delivery.
+*/
 QString QMqttMessageStatusProperties::reason() const
 {
     return data->reasonString;
 }
 
+/*!
+    Returns properties specified in conjunction with a message.
+*/
 QMqttUserProperties QMqttMessageStatusProperties::userProperties() const
 {
     return data->userProperties;