aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/controls/data/tst_slider.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-05 13:59:33 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-09 16:27:16 +0000
commite20e63a0b7d835fce16d41599dd69d348d5648b2 (patch)
tree5c7ea7399535e8ae53817548865f3a3621e3f00d /tests/auto/controls/data/tst_slider.qml
parent9d4f7a43120b0a05d2ae1b633a63f2f6f2c284d6 (diff)
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>
Diffstat (limited to 'tests/auto/controls/data/tst_slider.qml')
-rw-r--r--tests/auto/controls/data/tst_slider.qml16
1 files changed, 12 insertions, 4 deletions
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)