From dfc74f42d339e94617900447437d15cbaf08b08e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Tue, 21 Mar 2017 19:01:01 +0100 Subject: Slider: Don't suppress updates by dragThreshold on non-touchscreens When using a mouse, you want a slider to react immediately to input, not only if you move beyond a certain threshold. With the threshold it is very hard to accurately position the slider. On touchscreens, the threshold is necessary to allow for unrelated events, like flicking views, to not interfere with the value. Change-Id: I6cb8252338f20de559e062e738118593ffc1e099 Task-number: QTBUG-47081 Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_slider.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/controls/data') diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 1d7e92d2..0eec7e34 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -339,7 +339,7 @@ Item { // drag less than the threshold distance mouseMove(control, pt.x + Settings.dragThreshold - 1, pt.y) - compare(control.value, 0.5) + verify(control.value > 0.5) // drag over the threshold mouseMove(control, pt.x + Settings.dragThreshold + 1, pt.y) -- cgit v1.2.1 From f19b1bf1bfee79178bf5cd75df86863be49c21f0 Mon Sep 17 00:00:00 2001 From: Jussi Witick Date: Fri, 17 Feb 2017 10:27:12 +0200 Subject: Increase QtQuick import from 2.2 to 2.6 for QML Label Increase QtQuick import version to 2.6 to enable the properties of underlying QML Text type to be usable in the QML Label type too. Task-number: QTBUG-57895 Change-Id: I7a2b641a56c90ab91b4e6c973278d8943fa6903a Reviewed-by: J-P Nurmi --- tests/auto/controls/data/tst_label.qml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/auto/controls/data') diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index e5c53a52..145c7f14 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -69,6 +69,17 @@ TestCase { label.destroy() } + function test_textPaddings() { + var label = Qt.createQmlObject('import QtQuick.Controls 1.2; Label { leftPadding: 2; rightPadding: 2; topPadding: 2; bottomPadding: 2 }', testCase, ''); + + compare(label.leftPadding, 2) + compare(label.rightPadding, 2) + compare(label.topPadding, 2) + compare(label.bottomPadding, 2) + + label.destroy() + } + function test_activeFocusOnTab() { if (Qt.styleHints.tabFocusBehavior != Qt.TabFocusAllControls) skip("This function doesn't support NOT iterating all.") -- cgit v1.2.1