Merge remote-tracking branch 'origin/5.10' into dev

* origin/5.10:
  Doc: Bump version to 5.10.1
  iot-sensortag: Add an About tab
  iot-sensortag: Fix build against 5.10.0
  iot-sensortag: Create a quit button SmartWatch demo

Change-Id: I247db054b05cb481c67b08cd42fb762f5539460c

7 files changed, 71 insertions, 8 deletions

diff --git a/doc/b2qt-demos.qdoc b/doc/b2qt-demos.qdoc
index b9fd565..1a14796 100644
--- a/doc/b2qt-demos.qdoc
+++ b/doc/b2qt-demos.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the examples of Qt for Device Creation.
@@ -50,7 +50,7 @@
 
 /*!
     \page index.html
-    \title Qt 5.10.0 for Device Creation Examples and Demos
+    \title Qt 5.10.1 for Device Creation Examples and Demos
 
     \SDK has a number of examples and demos. These are included in the
     \B2Q images, available in the launcher that is run by default at
diff --git a/doc/b2qt-demos.qdocconf b/doc/b2qt-demos.qdocconf
index 2f4b125..51931cb 100644
--- a/doc/b2qt-demos.qdocconf
+++ b/doc/b2qt-demos.qdocconf
@@ -5,8 +5,8 @@ outputencoding               = UTF-8
 sourceencoding               = UTF-8
 
 project                      = QtforDeviceCreationDemos
-description                  = Qt 5.10.0 for Device Creation Examples and Demos
-version                      = 5.10.0
+description                  = Qt 5.10.1 for Device Creation Examples and Demos
+version                      = 5.10.1
 
 sourcedirs                   = .
 imagedirs                   += images
@@ -21,9 +21,9 @@ exampledirs                  = ..
 qhp.projects                 = QtforDeviceCreationDemos
 
 qhp.QtforDeviceCreationDemos.file                = b2qt-demos.qhp
-qhp.QtforDeviceCreationDemos.namespace           = org.qt-project.b2qt-demos.5100
+qhp.QtforDeviceCreationDemos.namespace           = org.qt-project.b2qt-demos.5101
 qhp.QtforDeviceCreationDemos.virtualFolder       = b2qt-demos
-qhp.QtforDeviceCreationDemos.indexTitle          = Qt 5.10.0 for Device Creation Examples and Demos
+qhp.QtforDeviceCreationDemos.indexTitle          = Qt 5.10.1 for Device Creation Examples and Demos
 qhp.QtforDeviceCreationDemos.indexRoot           =
 
 qhp.QtforDeviceCreationDemos.subprojects         = demos
@@ -35,4 +35,4 @@ manifestmeta.b2qt.names      = "QtforDeviceCreationDemos/*"
 macro.B2Q                    = "Boot to Qt"
 macro.SDK                    = "Qt for Device Creation"
 
-navigation.landingpage = "Qt 5.10.0 for Device Creation Examples and Demos"
+navigation.landingpage = "Qt 5.10.1 for Device Creation Examples and Demos"
diff --git a/tradeshow/iot-sensortag/mqttdataprovider.cpp b/tradeshow/iot-sensortag/mqttdataprovider.cpp
index 8985f02..16bc096 100644
--- a/tradeshow/iot-sensortag/mqttdataprovider.cpp
+++ b/tradeshow/iot-sensortag/mqttdataprovider.cpp
@@ -108,7 +108,7 @@ void MqttDataProvider::reset()
 
 void MqttDataProvider::messageReceived(const QMqttMessage &msg)
 {
-    parseMessage(msg.payload(), msg.topic());
+    parseMessage(msg.payload(), msg.topic().name());
     if (!m_pollTimer->isActive())
         m_pollTimer->start();
 }
diff --git a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
index 3c92c05..bb0ecf9 100644
--- a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
+++ b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
@@ -175,6 +175,7 @@ Item {
         id: utcGmt
         text: "UTC/GMT"
         color: "white"
+        visible: dateLabel.visible
         anchors.left: timeLabel.right
         anchors.leftMargin: 16
         anchors.bottom: parent.bottom
diff --git a/tradeshow/iot-sensortag/resources/watch/MainWatch.qml b/tradeshow/iot-sensortag/resources/watch/MainWatch.qml
index 801c38b..5a500a2 100644
--- a/tradeshow/iot-sensortag/resources/watch/MainWatch.qml
+++ b/tradeshow/iot-sensortag/resources/watch/MainWatch.qml
@@ -226,6 +226,54 @@ Item {
                 title: ""
             }
         }
+
+        Item {
+            Text {
+                text: qsTr("About")
+                anchors.fill: parent
+                color: "white"
+                font.pixelSize: titleFontSize
+            }
+
+            Rectangle {
+                id: aboutView
+                width: swipePane.width
+                height: swipePane.height
+                color: "transparent"
+
+                ColumnLayout {
+                    id: aboutLayout
+                    width: parent.width * 0.8
+                    height: parent.width * 0.8
+                    anchors.centerIn: parent
+
+                    Image {
+                        source: "images/BuiltWithQt.png"
+                        fillMode: Image.PreserveAspectFit
+                        width: parent.width
+                        Layout.maximumWidth: parent.width - 20
+                        Layout.maximumHeight: 100
+                        anchors.horizontalCenter: parent.horizontalCenter
+                    }
+
+                    Text {
+                        id: qtLinkLabel
+                        color: "white"
+                        text: "Visit us at http://qt.io"
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        font.pixelSize: Style.indicatorTitleSize
+                    }
+
+                    Text {
+                        color: "white"
+                        text: "qt.io/demos/IoTScale"
+                        anchors.horizontalCenter: parent.horizontalCenter
+                        font.pixelSize: Style.indicatorTitleSize
+                    }
+                }
+            }
+        }
+
     }
 
     TopToolbar {
@@ -236,5 +284,18 @@ Item {
         height: 48
         topbar.visible: false
         date.visible: false
+        Image {
+            id: quit
+            source: "images/Toolbar/exit_button.png"
+            fillMode: Image.PreserveAspectFit
+            anchors.top: parent.top
+            anchors.right: parent.right
+            anchors.margins: 5
+            scale: 0.7
+            MouseArea {
+                anchors.fill: parent
+                onClicked: Qt.quit()
+            }
+        }
     }
 }
diff --git a/tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png b/tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png
new file mode 100644
index 0000000..7e56de7
--- /dev/null
+++ b/tradeshow/iot-sensortag/resources/watch/images/BuiltWithQt.png
diff --git a/tradeshow/iot-sensortag/uiwatch.qrc b/tradeshow/iot-sensortag/uiwatch.qrc
index 74093da..5167663 100644
--- a/tradeshow/iot-sensortag/uiwatch.qrc
+++ b/tradeshow/iot-sensortag/uiwatch.qrc
@@ -30,5 +30,6 @@
         <file>resources/small/images/Gyro/gyro_ring2.png</file>
         <file>resources/small/images/Gyro/gyro_ring3.png</file>
         <file>resources/small/images/Gyro/gyro_outer.png</file>
+        <file>resources/watch/images/BuiltWithQt.png</file>
     </qresource>
 </RCC>