Use strict === equality for ScrollBar::orientation

Change-Id: Icaf1bcda4a996cc3348911c87e43c4af2a246d73
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit f5fc1d556da8f225275490cd539795ad8bba9bf2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

7 files changed, 14 insertions, 14 deletions

diff --git a/examples/quick/customitems/scrollbar/ScrollBar.qml b/examples/quick/customitems/scrollbar/ScrollBar.qml
index f2e46c5681..655335d78c 100644
--- a/examples/quick/customitems/scrollbar/ScrollBar.qml
+++ b/examples/quick/customitems/scrollbar/ScrollBar.qml
@@ -60,24 +60,24 @@ Item {
     // orientation can be either Qt.Vertical or Qt.Horizontal
     property real position
     property real pageSize
-    property variant orientation : Qt.Vertical
+    property int orientation : Qt.Vertical
 
     // A light, semi-transparent background
     Rectangle {
         id: background
         anchors.fill: parent
-        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
+        radius: orientation === Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
         color: "white"
         opacity: 0.3
     }
 
     // Size the bar to the required size, depending upon the orientation.
     Rectangle {
-        x: orientation == Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
-        y: orientation == Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
-        width: orientation == Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
-        height: orientation == Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
-        radius: orientation == Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
+        x: orientation === Qt.Vertical ? 1 : (scrollBar.position * (scrollBar.width-2) + 1)
+        y: orientation === Qt.Vertical ? (scrollBar.position * (scrollBar.height-2) + 1) : 1
+        width: orientation === Qt.Vertical ? (parent.width-2) : (scrollBar.pageSize * (scrollBar.width-2))
+        height: orientation === Qt.Vertical ? (scrollBar.pageSize * (scrollBar.height-2)) : (parent.height-2)
+        radius: orientation === Qt.Vertical ? (width/2 - 1) : (height/2 - 1)
         color: "black"
         opacity: 0.7
     }
diff --git a/src/quickcontrols2/basic/ScrollBar.qml b/src/quickcontrols2/basic/ScrollBar.qml
index 763f96bbe6..f3c06ef1fc 100644
--- a/src/quickcontrols2/basic/ScrollBar.qml
+++ b/src/quickcontrols2/basic/ScrollBar.qml
@@ -48,7 +48,7 @@ T.ScrollBar {
 
     padding: 2
     visible: control.policy !== T.ScrollBar.AlwaysOff
-    minimumSize: orientation == Qt.Horizontal ? height / width : width / height
+    minimumSize: orientation === Qt.Horizontal ? height / width : width / height
 
     contentItem: Rectangle {
         implicitWidth: control.interactive ? 6 : 2
diff --git a/src/quickcontrols2/fusion/ScrollBar.qml b/src/quickcontrols2/fusion/ScrollBar.qml
index b990d955c1..5221e0dfff 100644
--- a/src/quickcontrols2/fusion/ScrollBar.qml
+++ b/src/quickcontrols2/fusion/ScrollBar.qml
@@ -50,7 +50,7 @@ T.ScrollBar {
 
     padding: 2
     visible: control.policy !== T.ScrollBar.AlwaysOff
-    minimumSize: orientation == Qt.Horizontal ? height / width : width / height
+    minimumSize: orientation === Qt.Horizontal ? height / width : width / height
 
     contentItem: Rectangle {
         implicitWidth: control.interactive ? 6 : 2
diff --git a/src/quickcontrols2/imagine/ScrollBar.qml b/src/quickcontrols2/imagine/ScrollBar.qml
index f512a0b71c..08facb6b4f 100644
--- a/src/quickcontrols2/imagine/ScrollBar.qml
+++ b/src/quickcontrols2/imagine/ScrollBar.qml
@@ -48,7 +48,7 @@ T.ScrollBar {
                              implicitContentHeight + topPadding + bottomPadding)
 
     visible: control.policy !== T.ScrollBar.AlwaysOff
-    minimumSize: orientation == Qt.Horizontal ? height / width : width / height
+    minimumSize: orientation === Qt.Horizontal ? height / width : width / height
 
     topPadding: background ? background.topPadding : 0
     leftPadding: background ? background.leftPadding : 0
diff --git a/src/quickcontrols2/material/ScrollBar.qml b/src/quickcontrols2/material/ScrollBar.qml
index 55de0d13d1..e89452174c 100644
--- a/src/quickcontrols2/material/ScrollBar.qml
+++ b/src/quickcontrols2/material/ScrollBar.qml
@@ -48,7 +48,7 @@ T.ScrollBar {
 
     padding: control.interactive ? 1 : 2
     visible: control.policy !== T.ScrollBar.AlwaysOff
-    minimumSize: orientation == Qt.Horizontal ? height / width : width / height
+    minimumSize: orientation === Qt.Horizontal ? height / width : width / height
 
     contentItem: Rectangle {
         implicitWidth: control.interactive ? 13 : 4
diff --git a/src/quickcontrols2/universal/ScrollBar.qml b/src/quickcontrols2/universal/ScrollBar.qml
index d101658c8e..9824ed1b36 100644
--- a/src/quickcontrols2/universal/ScrollBar.qml
+++ b/src/quickcontrols2/universal/ScrollBar.qml
@@ -47,7 +47,7 @@ T.ScrollBar {
                              implicitContentHeight + topPadding + bottomPadding)
 
     visible: control.policy !== T.ScrollBar.AlwaysOff
-    minimumSize: orientation == Qt.Horizontal ? height / width : width / height
+    minimumSize: orientation === Qt.Horizontal ? height / width : width / height
 
     // TODO: arrows
 
diff --git a/src/quickcontrols2/windows/ScrollBar.qml b/src/quickcontrols2/windows/ScrollBar.qml
index 0ccbb1557e..8972cfc53c 100644
--- a/src/quickcontrols2/windows/ScrollBar.qml
+++ b/src/quickcontrols2/windows/ScrollBar.qml
@@ -105,8 +105,8 @@ NativeStyle.DefaultScrollBar {
     __increaseVisual.indicator: NativeStyle.ScrollBar {
         control: controlRoot
         subControl: NativeStyle.ScrollBar.AddLine
-        x: orientation == Qt.Horizontal ? controlRoot.width - width : 0
-        y: orientation == Qt.Vertical ? controlRoot.height - height : 0
+        x: orientation === Qt.Horizontal ? controlRoot.width - width : 0
+        y: orientation === Qt.Vertical ? controlRoot.height - height : 0
         overrideState: NativeStyle.ScrollBar.AlwaysHovered
         opacity: controlRoot.__increaseVisual.hovered ? 1 : 0
         visible: contentItem instanceof NativeStyle.StyleItem