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

Change-Id: I08eb1b887d7b8cfaae3e105d176136886682c865

3 files changed, 13 insertions, 4 deletions

diff --git a/tradeshow/iot-sensortag/resources/base/BaseChart.qml b/tradeshow/iot-sensortag/resources/base/BaseChart.qml
index 7c846a5..bc850fc 100644
--- a/tradeshow/iot-sensortag/resources/base/BaseChart.qml
+++ b/tradeshow/iot-sensortag/resources/base/BaseChart.qml
@@ -74,7 +74,7 @@ Item {
 
     Image {
         id: titleIcon
-
+        visible: Style.uiStyle == "small"
         anchors.top: parent.top
         source: pathPrefix + "General/icon_sensor.png"
     }
@@ -148,6 +148,7 @@ Item {
             axis.z: 0
             angle: rightSide ? 180 : 0
         }
+        visible: Style.uiStyle == "small"
     }
 
     MouseArea {
diff --git a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
index 69722b7..3c92c05 100644
--- a/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
+++ b/tradeshow/iot-sensortag/resources/base/TopToolbar.qml
@@ -57,6 +57,9 @@ Item {
     height: 100
     width: implicitWidth
 
+    property alias topbar: topbar
+    property alias date: dateLabel
+
     SensorSettings {
         id: sensorList
 
@@ -130,6 +133,7 @@ Item {
     }
 
     Text {
+        id: dateLabel
         property bool showAddress : false
         text: showAddress ? mainWindow.addresses : Qt.formatDateTime(new Date, "dddd, MMMM d, yyyy")
         color: "white"
@@ -168,6 +172,7 @@ Item {
     }
 
     Text {
+        id: utcGmt
         text: "UTC/GMT"
         color: "white"
         anchors.left: timeLabel.right
@@ -187,6 +192,7 @@ Item {
     }
 
     Image {
+        id: topbar
         anchors.bottom: parent.bottom
         anchors.bottomMargin: -18
         source: pathPrefix + "Toolbar/topbar_all.png"
diff --git a/tradeshow/iot-sensortag/resources/base/main.qml b/tradeshow/iot-sensortag/resources/base/main.qml
index c756c6d..05b0f21 100644
--- a/tradeshow/iot-sensortag/resources/base/main.qml
+++ b/tradeshow/iot-sensortag/resources/base/main.qml
@@ -48,11 +48,13 @@
 **
 ****************************************************************************/
 import QtQuick 2.6
+import QtQuick.Controls 1.4
 import QtQuick.Window 2.0
 import SensorTag.DataProvider 1.0
 import SensorTag.SeriesStorage 1.0
+import Style 1.0
 
-Window {
+ApplicationWindow {
     id: mainWindow
 
     property var singleSensorSource : null
@@ -73,8 +75,8 @@ Window {
     }
 
     // Size defaults to the small display
-    width: 1920
-    height: 1080
+    width: Style.width
+    height: Style.height
     visible: true
     color: "black"