From 76ab4f6568e7c81bfc1b2e53ed7a33898e086f8a Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Mon, 28 Jan 2019 09:54:07 +0200
Subject: Enable boot2qt launcher automatic demo mode

Task-number: QTBUG-72852
Change-Id: I0e134e76721e73721a8318534bbaa12d68c92ca7
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 src/settingsui/settingsuiplugin/SettingsHeader.qml | 1 +
 src/settingsui/settingsuiplugin/pluginMain.qml     | 1 +
 2 files changed, 2 insertions(+)

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
-- 
cgit v1.2.3


From 090f17a39cce1d2c14fb1b06ee5e54758b0b7f55 Mon Sep 17 00:00:00 2001
From: Mikko Gronoff <mikko.gronoff@qt.io>
Date: Tue, 5 Feb 2019 15:00:40 +0200
Subject: Doc: Bump version to 5.12.2

Change-Id: Ib1832933eef515c4ffe3193619c2d79a1e7aca6f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index a40928a..7748e52 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
-MODULE_VERSION=5.12.1
+MODULE_VERSION=5.12.2
 CMAKE_MODULE_TESTS=-
-- 
cgit v1.2.3