From 73524deb8d580893b46a21ccd489efc19247a844 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 15 Feb 2019 11:38:07 +0100 Subject: [PATCH 1/2] Add settingKey property for Squish to find things easier --- resources/qml/Settings/SettingItem.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Settings/SettingItem.qml b/resources/qml/Settings/SettingItem.qml index 4dd53f8663..e1a13fe425 100644 --- a/resources/qml/Settings/SettingItem.qml +++ b/resources/qml/Settings/SettingItem.qml @@ -28,6 +28,7 @@ Item property var showLinkedSettingIcon: true property var doDepthIndentation: true property var doQualityUserSettingEmphasis: true + property var settingKey: definition.key //Used to detect each individual setting more easily in Squish GUI tests. // Create properties to put property provider stuff in (bindings break in qt 5.5.1 otherwise) property var state: propertyProvider.properties.state From 4a0bb43e3977205e4da6fe9fb5fd21ea278b5db9 Mon Sep 17 00:00:00 2001 From: Satish Date: Fri, 15 Feb 2019 12:08:42 +0100 Subject: [PATCH 2/2] CURA-6201 - Added an id to stage buttons for the integration tests --- resources/qml/MainWindow/MainWindowHeader.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/qml/MainWindow/MainWindowHeader.qml b/resources/qml/MainWindow/MainWindowHeader.qml index ffcad4c75b..fab8010dd7 100644 --- a/resources/qml/MainWindow/MainWindowHeader.qml +++ b/resources/qml/MainWindow/MainWindowHeader.qml @@ -67,6 +67,8 @@ Item property color overlayColor: "transparent" property string overlayIconSource: "" + // This id is required to find the stage buttons through Squish + property string stageId: model.id // This is a trick to assure the activeStage is correctly changed. It doesn't work propertly if done in the onClicked (see CURA-6028) MouseArea