Remove Control::layoutDirection

Calculate QQuickControl::isMirrored() from LayoutMirroring.enabled
(QQuickItemPrivate::isMirrored()) and QLocale::textDirection().

Change-Id: I0e391d27df732734031f3e94d9828a1a2cfa7474
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

4 files changed, 46 insertions, 52 deletions

diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml
index 34173026..3bfc5e63 100644
--- a/tests/auto/controls/data/tst_control.qml
+++ b/tests/auto/controls/data/tst_control.qml
@@ -57,16 +57,6 @@ TestCase {
     }
 
     SignalSpy {
-        id: layoutDirectionSpy
-        signalName: "layoutDirectionChanged"
-    }
-
-    SignalSpy {
-        id: effectiveLayoutDirectionSpy
-        signalName: "effectiveLayoutDirectionChanged"
-    }
-
-    SignalSpy {
         id: mirroredSpy
         signalName: "mirroredChanged"
     }
@@ -213,54 +203,33 @@ TestCase {
         control.destroy()
     }
 
-    function test_layoutDirection() {
+    function test_mirrored() {
         var control = component.createObject(testCase)
         verify(control)
 
-        layoutDirectionSpy.target = control
-        effectiveLayoutDirectionSpy.target = control
         mirroredSpy.target = control
-
-        verify(layoutDirectionSpy.valid)
-        verify(effectiveLayoutDirectionSpy.valid)
         verify(mirroredSpy.valid)
 
+        control.locale = Qt.locale("en_US")
+        compare(control.locale.name, "en_US")
         verify(!control.LayoutMirroring.enabled)
-        compare(control.layoutDirection, Qt.LeftToRight)
-        compare(control.effectiveLayoutDirection, Qt.LeftToRight)
         compare(control.mirrored, false)
 
-        control.layoutDirection = Qt.RightToLeft
-        compare(control.layoutDirection, Qt.RightToLeft)
-        compare(control.effectiveLayoutDirection, Qt.RightToLeft)
+        control.locale = Qt.locale("ar_EG")
         compare(control.mirrored, true)
-        compare(layoutDirectionSpy.count, 1)
-        compare(effectiveLayoutDirectionSpy.count, 1)
         compare(mirroredSpy.count, 1)
 
         control.LayoutMirroring.enabled = true
-        compare(control.layoutDirection, Qt.RightToLeft)
-        compare(control.effectiveLayoutDirection, Qt.LeftToRight)
-        compare(control.mirrored, false)
-        compare(layoutDirectionSpy.count, 1)
-        compare(effectiveLayoutDirectionSpy.count, 2)
-        compare(mirroredSpy.count, 2)
+        compare(control.mirrored, true)
+        compare(mirroredSpy.count, 1)
 
-        control.layoutDirection = Qt.LeftToRight
-        compare(control.layoutDirection, Qt.LeftToRight)
-        compare(control.effectiveLayoutDirection, Qt.RightToLeft)
+        control.locale = Qt.locale("en_US")
         compare(control.mirrored, true)
-        compare(layoutDirectionSpy.count, 2)
-        compare(effectiveLayoutDirectionSpy.count, 3)
-        compare(mirroredSpy.count, 3)
+        compare(mirroredSpy.count, 1)
 
         control.LayoutMirroring.enabled = false
-        compare(control.layoutDirection, Qt.LeftToRight)
-        compare(control.effectiveLayoutDirection, Qt.LeftToRight)
         compare(control.mirrored, false)
-        compare(layoutDirectionSpy.count, 2)
-        compare(effectiveLayoutDirectionSpy.count, 4)
-        compare(mirroredSpy.count, 4)
+        compare(mirroredSpy.count, 2)
 
         control.destroy()
     }
diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml
index ed09f5e9..d5ee3e52 100644
--- a/tests/auto/controls/data/tst_progressbar.qml
+++ b/tests/auto/controls/data/tst_progressbar.qml
@@ -159,18 +159,26 @@ TestCase {
         compare(control.value, 0.25)
         compare(control.visualPosition, 0.25)
 
-        control.layoutDirection = Qt.RightToLeft
+        // RTL locale
+        control.locale = Qt.locale("ar_EG")
         compare(control.visualPosition, 0.75)
 
+        // RTL locale + LayoutMirroring
         control.LayoutMirroring.enabled = true
-        compare(control.visualPosition, 0.25)
+        compare(control.visualPosition, 0.75)
 
-        control.layoutDirection = Qt.LeftToRight
+        // LTR locale + LayoutMirroring
+        control.locale = Qt.locale("en_US")
         compare(control.visualPosition, 0.75)
 
+        // LTR locale
         control.LayoutMirroring.enabled = false
         compare(control.visualPosition, 0.25)
 
+        // LayoutMirroring
+        control.LayoutMirroring.enabled = true
+        compare(control.visualPosition, 0.75)
+
         control.destroy()
     }
 }
diff --git a/tests/auto/controls/data/tst_rangeslider.qml b/tests/auto/controls/data/tst_rangeslider.qml
index 345013f2..2a77d205 100644
--- a/tests/auto/controls/data/tst_rangeslider.qml
+++ b/tests/auto/controls/data/tst_rangeslider.qml
@@ -251,22 +251,31 @@ TestCase {
         compare(control.second.position, 1.0)
         compare(control.second.visualPosition, 1.0)
 
-        control.layoutDirection = Qt.RightToLeft
+        // RTL locale
+        control.locale = Qt.locale("ar_EG")
         compare(control.first.visualPosition, 0.75)
         compare(control.second.visualPosition, 0.0)
 
+        // RTL locale + LayoutMirroring
         control.LayoutMirroring.enabled = true
-        compare(control.first.visualPosition, 0.25)
-        compare(control.second.visualPosition, 1.0)
+        compare(control.first.visualPosition, 0.75)
+        compare(control.second.visualPosition, 0.0)
 
-        control.layoutDirection = Qt.LeftToRight
+        // LTR locale + LayoutMirroring
+        control.locale = Qt.locale("en_US")
         compare(control.first.visualPosition, 0.75)
         compare(control.second.visualPosition, 0.0)
 
+        // LTR locale
         control.LayoutMirroring.enabled = false
         compare(control.first.visualPosition, 0.25)
         compare(control.second.visualPosition, 1.0)
 
+        // LayoutMirroring
+        control.LayoutMirroring.enabled = true
+        compare(control.first.visualPosition, 0.75)
+        compare(control.second.visualPosition, 0.0)
+
         control.destroy()
     }
 
@@ -545,7 +554,7 @@ TestCase {
 
         // RTL
         control.first.value = 0
-        control.layoutDirection = Qt.RightToLeft
+        control.locale = Qt.locale("ar_EG")
 
         mousePress(control, control.first.handle.x, control.first.handle.y, Qt.LeftButton)
         compare(firstPressedSpy.count, 3)
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml
index e497636c..5957442f 100644
--- a/tests/auto/controls/data/tst_slider.qml
+++ b/tests/auto/controls/data/tst_slider.qml
@@ -185,18 +185,26 @@ TestCase {
         compare(control.value, 0.25)
         compare(control.visualPosition, 0.25)
 
-        control.layoutDirection = Qt.RightToLeft
+        // RTL locale
+        control.locale = Qt.locale("ar_EG")
         compare(control.visualPosition, 0.75)
 
+        // RTL locale + LayoutMirroring
         control.LayoutMirroring.enabled = true
-        compare(control.visualPosition, 0.25)
+        compare(control.visualPosition, 0.75)
 
-        control.layoutDirection = Qt.LeftToRight
+        // LTR locale + LayoutMirroring
+        control.locale = Qt.locale("en_US")
         compare(control.visualPosition, 0.75)
 
+        // LTR locale
         control.LayoutMirroring.enabled = false
         compare(control.visualPosition, 0.25)
 
+        // LayoutMirroring
+        control.LayoutMirroring.enabled = true
+        compare(control.visualPosition, 0.75)
+
         control.destroy()
     }
 
@@ -399,7 +407,7 @@ TestCase {
 
         // RTL
         control.value = 0
-        control.layoutDirection = Qt.RightToLeft
+        control.locale = Qt.locale("ar_EG")
 
         mousePress(control, 0, 0, Qt.LeftButton)
         compare(pressedSpy.count, 3)