From bac9cc5b55294655ba08f424f402d21f46c00c15 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 23 May 2015 11:15:21 +0200 Subject: Fix Control::mirroredChanged() emission It was emitted only when LayoutMirroring.enabled changed, but it also needs to be emitted when layoutDirection changes... Change-Id: I9424fdf232c11669780c9abace5c162a0df69dbe Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_control.qml | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'tests') diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 9143c3f1..3d46ff16 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -55,6 +55,21 @@ TestCase { Control { } } + SignalSpy { + id: layoutDirectionSpy + signalName: "layoutDirectionChanged" + } + + SignalSpy { + id: effectiveLayoutDirectionSpy + signalName: "effectiveLayoutDirectionChanged" + } + + SignalSpy { + id: mirroredSpy + signalName: "mirroredChanged" + } + function test_defaults() { var control = component.createObject(testCase) verify(control) @@ -67,6 +82,14 @@ TestCase { function test_layoutDirection() { var control = component.createObject(testCase) + layoutDirectionSpy.target = control + effectiveLayoutDirectionSpy.target = control + mirroredSpy.target = control + + verify(layoutDirectionSpy.valid) + verify(effectiveLayoutDirectionSpy.valid) + verify(mirroredSpy.valid) + verify(!control.LayoutMirroring.enabled) compare(control.layoutDirection, Qt.LeftToRight) compare(control.effectiveLayoutDirection, Qt.LeftToRight) @@ -76,21 +99,33 @@ TestCase { compare(control.layoutDirection, Qt.RightToLeft) compare(control.effectiveLayoutDirection, Qt.RightToLeft) 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) control.layoutDirection = Qt.LeftToRight compare(control.layoutDirection, Qt.LeftToRight) compare(control.effectiveLayoutDirection, Qt.RightToLeft) compare(control.mirrored, true) + compare(layoutDirectionSpy.count, 2) + compare(effectiveLayoutDirectionSpy.count, 3) + compare(mirroredSpy.count, 3) 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) control.destroy() } -- cgit v1.2.3