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_control.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_control.qml')
-rw-r--r-- | tests/auto/controls/data/tst_control.qml | 49 |
1 files changed, 9 insertions, 40 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() } |