diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-06 10:27:56 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-06 11:49:07 +0200 |
commit | 0ea39397893edb54454bfceabde4b83fc5b60a2e (patch) | |
tree | 16cf3924185d39df0354767404051175377029be | |
parent | 8f0cc63e40451cd1ffaf39cfcac37012a37f255f (diff) | |
parent | f732f98e0cb3871c5a2cb1c94d68f812daa9abba (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
f732f98 Doc: Bump version to 5.12.2
ec7cc51 Enable boot2qt launcher automatic demo mode
Change-Id: Ie4b7653de8f87d6a31d3af83bc80876294f7620d
-rw-r--r-- | basicsuite/ebike-ui/MainPage.qml | 3 | ||||
-rw-r--r-- | basicsuite/ebike-ui/SpeedView.qml | 1 | ||||
-rw-r--r-- | basicsuite/enterprise-charts/main.qml | 1 | ||||
-rw-r--r-- | basicsuite/graphicaleffects/main.qml | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/basicsuite/ebike-ui/MainPage.qml b/basicsuite/ebike-ui/MainPage.qml index ae36401..e459789 100644 --- a/basicsuite/ebike-ui/MainPage.qml +++ b/basicsuite/ebike-ui/MainPage.qml @@ -54,6 +54,7 @@ Page { StatsBox { id: statsButton + objectName: "ebikeStatsButton" anchors.left: parent.left anchors.top: parent.top @@ -67,6 +68,7 @@ Page { NaviBox { id: naviButton + objectName: "ebikeNaviButton" anchors.right: parent.right anchors.top: parent.top arrowSource: naviGuideArrowSource @@ -82,6 +84,7 @@ Page { LightsBox { id: lightsButton + objectName: "ebikeLightsButton" anchors.left: parent.left anchors.bottom: parent.bottom } diff --git a/basicsuite/ebike-ui/SpeedView.qml b/basicsuite/ebike-ui/SpeedView.qml index 1a153d3..49be98a 100644 --- a/basicsuite/ebike-ui/SpeedView.qml +++ b/basicsuite/ebike-ui/SpeedView.qml @@ -40,6 +40,7 @@ import "./BikeStyle" Rectangle { id: speedViewItem + objectName: "ebikeSpeedView" width: root.width * 0.35 height: width color: "transparent" diff --git a/basicsuite/enterprise-charts/main.qml b/basicsuite/enterprise-charts/main.qml index 5fadbbd..02b4f8b 100644 --- a/basicsuite/enterprise-charts/main.qml +++ b/basicsuite/enterprise-charts/main.qml @@ -67,6 +67,7 @@ Rectangle { ListView { id: root + objectName: "chartsListView" focus: true anchors.fill: parent snapMode: ListView.SnapOneItem diff --git a/basicsuite/graphicaleffects/main.qml b/basicsuite/graphicaleffects/main.qml index 4eb694d..eb6421c 100644 --- a/basicsuite/graphicaleffects/main.qml +++ b/basicsuite/graphicaleffects/main.qml @@ -94,6 +94,7 @@ Item { ListView { id: list + objectName: "graphicsEffectsList" anchors.top: parent.top anchors.left: parent.left width: parent.width / 4 |