Merge branch 'master' of github.com:Ultimaker/Cura

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

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