diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:43:05 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-02-12 10:46:51 +0200 |
| commit | 55df38263ee7902eff15ab452fa8bc222fcf07b3 (patch) | |
| tree | a4ee5425e2dbc870ac4ce72e8435a4e39f6e3dca /tradeshow/iot-sensortag/resources/base/TopToolbar.qml | |
| parent | a028e8328056979f09e3dd35ded54890dbef1fd9 (diff) | |
| parent | f8bbf6dd890c1d111bda52bf83e8c6c90213844e (diff) | |
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
Diffstat (limited to 'tradeshow/iot-sensortag/resources/base/TopToolbar.qml')
| -rw-r--r-- | tradeshow/iot-sensortag/resources/base/TopToolbar.qml | 1 |
1 files changed, 1 insertions, 0 deletions
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 |