diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-05 13:59:33 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-09 16:27:16 +0000 |
| commit | e20e63a0b7d835fce16d41599dd69d348d5648b2 (patch) | |
| tree | 5c7ea7399535e8ae53817548865f3a3621e3f00d /tests/auto/controls/data/tst_rangeslider.qml | |
| parent | 9d4f7a43120b0a05d2ae1b633a63f2f6f2c284d6 (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_rangeslider.qml')
| -rw-r--r-- | tests/auto/controls/data/tst_rangeslider.qml | 19 |
1 files changed, 14 insertions, 5 deletions
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) |