Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: I8dbf36b760f72a60b745197367b812185ead8133

3 files changed, 32 insertions, 8 deletions

diff --git a/src/controls/Private/CalendarHeaderModel.qml b/src/controls/Private/CalendarHeaderModel.qml
index ef57e65b5..8adfcc1ae 100644
--- a/src/controls/Private/CalendarHeaderModel.qml
+++ b/src/controls/Private/CalendarHeaderModel.qml
@@ -68,6 +68,28 @@ ListModel {
     */
     property var locale
 
+    ListElement {
+        dayOfWeek: Locale.Sunday
+    }
+    ListElement {
+        dayOfWeek: Locale.Monday
+    }
+    ListElement {
+        dayOfWeek: Locale.Tuesday
+    }
+    ListElement {
+        dayOfWeek: Locale.Wednesday
+    }
+    ListElement {
+        dayOfWeek: Locale.Thursday
+    }
+    ListElement {
+        dayOfWeek: Locale.Friday
+    }
+    ListElement {
+        dayOfWeek: Locale.Saturday
+    }
+
     Component.onCompleted: {
         var daysOfWeek = [Locale.Sunday, Locale.Monday, Locale.Tuesday,
             Locale.Wednesday, Locale.Thursday, Locale.Friday, Locale.Saturday];
@@ -76,9 +98,10 @@ ListModel {
         var shifted = daysOfWeek.splice(firstDayOfWeek, daysOfWeek.length - firstDayOfWeek);
         daysOfWeek = shifted.concat(daysOfWeek)
 
-        for (var i = 0; i < daysOfWeek.length; ++i) {
-            var element = { dayOfWeek: daysOfWeek[i] }
-            root.append(element);
+        if (firstDayOfWeek !== Locale.Sunday) {
+            for (var i = 0; i < daysOfWeek.length; ++i) {
+                root.setProperty(i, "dayOfWeek", daysOfWeek[i]);
+            }
         }
     }
 }
diff --git a/src/controls/Private/EditMenu_base.qml b/src/controls/Private/EditMenu_base.qml
index 354b9c66d..0078c8951 100644
--- a/src/controls/Private/EditMenu_base.qml
+++ b/src/controls/Private/EditMenu_base.qml
@@ -70,7 +70,7 @@ Item {
     Component {
         id: cutAction
         Action {
-            text: "Cu&t"
+            text: qsTr("Cu&t")
             shortcut: StandardKey.Cut
             iconName: "edit-cut"
             enabled: !input.readOnly && selectionStart !== selectionEnd
@@ -84,7 +84,7 @@ Item {
     Component {
         id: copyAction
         Action {
-            text: "&Copy"
+            text: qsTr("&Copy")
             shortcut: StandardKey.Copy
             iconName: "edit-copy"
             enabled: input.selectionStart !== input.selectionEnd
@@ -98,7 +98,7 @@ Item {
     Component {
         id: pasteAction
         Action {
-            text: "&Paste"
+            text: qsTr("&Paste")
             shortcut: StandardKey.Paste
             iconName: "edit-paste"
             enabled: input.canPaste
diff --git a/src/controls/Private/HoverButton.qml b/src/controls/Private/HoverButton.qml
index 1b79e087a..964d30d36 100644
--- a/src/controls/Private/HoverButton.qml
+++ b/src/controls/Private/HoverButton.qml
@@ -62,9 +62,10 @@ Item {
 
     Image {
         id: image
-        width: implicitWidth/2
-        height: implicitHeight/2
+        width: Math.min(implicitWidth, parent.width * 0.4)
+        height: Math.min(implicitHeight, parent.height * 0.4)
         anchors.centerIn: parent
+        fillMode: Image.PreserveAspectFit
         opacity: 0.6
     }