diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-06 12:01:12 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-06 12:01:40 +0200 |
| commit | 0b7e135bfbe8fbb40ec97ed1d643429418a93f61 (patch) | |
| tree | 4479308ba279ace96f6d50da76b296617e92a8e3 | |
| parent | 17c44a3ce8552be1cfe9b6e61e821cfe60ef05a5 (diff) | |
| parent | 090f17a39cce1d2c14fb1b06ee5e54758b0b7f55 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
090f17a Doc: Bump version to 5.12.2
76ab4f6 Enable boot2qt launcher automatic demo mode
Change-Id: I6eb8fb9cb56b3d01e3f88a636ebd7ba9e6b16a47
| -rw-r--r-- | src/settingsui/settingsuiplugin/SettingsHeader.qml | 1 | ||||
| -rw-r--r-- | src/settingsui/settingsuiplugin/pluginMain.qml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/settingsui/settingsuiplugin/SettingsHeader.qml b/src/settingsui/settingsuiplugin/SettingsHeader.qml index 24192c9..c9ba7cf 100644 --- a/src/settingsui/settingsuiplugin/SettingsHeader.qml +++ b/src/settingsui/settingsuiplugin/SettingsHeader.qml @@ -41,6 +41,7 @@ Item { Image { id: backButton + objectName: "settingsBackButton" anchors.left: parent.left anchors.top: parent.top source: "../newIcons/back_icon.svg" diff --git a/src/settingsui/settingsuiplugin/pluginMain.qml b/src/settingsui/settingsuiplugin/pluginMain.qml index 6f19a3b..28e2464 100644 --- a/src/settingsui/settingsuiplugin/pluginMain.qml +++ b/src/settingsui/settingsuiplugin/pluginMain.qml @@ -89,6 +89,7 @@ Rectangle { ListView { id: settingsList + objectName: "settingsList" anchors.top: settingsHeader.bottom anchors.left: parent.left anchors.bottom: parent.bottom |