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

Conflicts:
	src/imports/platform/qquickplatformmenuitem.cpp

Change-Id: I4d399aa81a31112edf6030b52ba5d68828f9729d

9 files changed, 8 insertions, 6 deletions

diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index 61f79a53..38a7b2c0 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -102,7 +102,7 @@ T.SpinBox {
         Rectangle {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
-            width: Math.min(parent.width / 3, parent.width / 3)
+            width: Math.min(parent.width / 3, parent.height / 3)
             height: 2
             color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor
         }
@@ -110,7 +110,7 @@ T.SpinBox {
             x: (parent.width - width) / 2
             y: (parent.height - height) / 2
             width: 2
-            height: Math.min(parent.width / 3, parent.width / 3)
+            height: Math.min(parent.width / 3, parent.height / 3)
             color: enabled ? control.Material.foreground : control.Material.spinBoxDisabledIconColor
         }
     }
diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml
index 08670339..cb0a164f 100644
--- a/src/imports/controls/material/ToolBar.qml
+++ b/src/imports/controls/material/ToolBar.qml
@@ -52,6 +52,8 @@ T.ToolBar {
 
     Material.foreground: Material.toolTextColor
 
+    spacing: 16
+
     background: Rectangle {
         implicitHeight: 48
         color: control.Material.toolBarColor
diff --git a/src/imports/controls/material/images/check@2x.png b/src/imports/controls/material/images/check@2x.png
index 744f80b5..deb0c7e9 100644
--- a/src/imports/controls/material/images/check@2x.png
+++ b/src/imports/controls/material/images/check@2x.png
diff --git a/src/imports/controls/material/images/check@3x.png b/src/imports/controls/material/images/check@3x.png
index dbf12b6d..72ffd4e6 100644
--- a/src/imports/controls/material/images/check@3x.png
+++ b/src/imports/controls/material/images/check@3x.png
diff --git a/src/imports/controls/material/images/check@4x.png b/src/imports/controls/material/images/check@4x.png
index 764dd7ee..9dc1ab2c 100644
--- a/src/imports/controls/material/images/check@4x.png
+++ b/src/imports/controls/material/images/check@4x.png
diff --git a/src/imports/controls/material/qmldir b/src/imports/controls/material/qmldir
index 6125e67d..27d1298a 100644
--- a/src/imports/controls/material/qmldir
+++ b/src/imports/controls/material/qmldir
@@ -1,4 +1,4 @@
 module QtQuick.Controls.Material
 plugin qtquickcontrols2materialstyleplugin
 classname QtQuickControls2MaterialStylePlugin
-depends QtQuick.Controls 2.0
+depends QtQuick.Controls 2.1
diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir
index 50f786d7..8e5cca4f 100644
--- a/src/imports/controls/qmldir
+++ b/src/imports/controls/qmldir
@@ -1,5 +1,5 @@
 module QtQuick.Controls
 plugin qtquickcontrols2plugin
 classname QtQuickControls2Plugin
-depends QtQuick.Templates 2.0
+depends QtQuick.Templates 2.1
 designersupported
diff --git a/src/imports/controls/universal/qmldir b/src/imports/controls/universal/qmldir
index e4b804a6..1dde3a02 100644
--- a/src/imports/controls/universal/qmldir
+++ b/src/imports/controls/universal/qmldir
@@ -1,4 +1,4 @@
 module QtQuick.Controls.Universal
 plugin qtquickcontrols2universalstyleplugin
 classname QtQuickControls2UniversalStylePlugin
-depends QtQuick.Controls 2.0
+depends QtQuick.Controls 2.1
diff --git a/src/imports/platform/qquickplatformmenuitem.cpp b/src/imports/platform/qquickplatformmenuitem.cpp
index 0a041a91..9f3abc1a 100644
--- a/src/imports/platform/qquickplatformmenuitem.cpp
+++ b/src/imports/platform/qquickplatformmenuitem.cpp
@@ -403,7 +403,7 @@ void QQuickPlatformMenuItem::setChecked(bool checked)
     \value MenuItem.AboutQtRole The item handles the "About Qt" menu item.
     \value MenuItem.AboutRole The item should be placed where the "About" menu item is in the application menu. The text of
            the menu item will be set to "About <application name>". The application name is fetched from the
-           \c{Info.plist} file in the application's bundle (See \l{Qt for OS X - Deployment}).
+           \c{Info.plist} file in the application's bundle (See \l{Qt for macOS - Deployment}).
     \value MenuItem.PreferencesRole The item should be placed where the "Preferences..." menu item is in the application menu.
     \value MenuItem.QuitRole The item should be placed where the Quit menu item is in the application menu.