diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:37:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 15:17:02 +0200 |
commit | 953b8d7ed82f2701ba8f6f572e60468da544c5ec (patch) | |
tree | a5f2d6b69c9f3ea65c427120f4f2c07d2d3db6e7 /tests/auto/controls/data/tst_slider.qml | |
parent | 9b206d4b0836f0f89aa667b44c6ac0a963808366 (diff) | |
download | qtquickcontrols-953b8d7ed82f2701ba8f6f572e60468da544c5ec.tar.gz |
Bump QtQuick.Controls import version to 1.2
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'tests/auto/controls/data/tst_slider.qml')
-rw-r--r-- | tests/auto/controls/data/tst_slider.qml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index f9136364..e5614566 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -63,7 +63,7 @@ Item { } function test_vertical() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); verify(slider.height < slider.width) slider.orientation = Qt.Vertical; @@ -72,7 +72,7 @@ Item { } function test_minimumvalue() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -83,7 +83,7 @@ Item { } function test_maximumvalue() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', testCase, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', testCase, ''); slider.minimumValue = 5 slider.maximumValue = 10 @@ -94,7 +94,7 @@ Item { } function test_rightLeftKeyPressed() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', container, ''); slider.forceActiveFocus() slider.maximumValue = 20 slider.minimumValue = 0 @@ -110,7 +110,7 @@ Item { } function test_mouseWheel() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {}', container, ''); slider.forceActiveFocus() slider.value = 0 slider.maximumValue = 300 @@ -153,7 +153,7 @@ Item { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -170,7 +170,7 @@ Item { skip("This function doesn't support NOT iterating all.") var test_control = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ width: 200; \ height: 200; \ @@ -240,7 +240,7 @@ Item { function test_updateValueWhileDragging() { var controlString = 'import QtQuick 2.2 ; \ - import QtQuick.Controls 1.1 ; \ + import QtQuick.Controls 1.2 ; \ import QtQuick.Controls.Styles 1.1; \ Slider { \ width: 200 ; \ @@ -270,7 +270,7 @@ Item { } function test_sliderOffset() { - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {x: 20; y: 20; width: 100; height: 50}', container, '') // Don't move slider value if mouse is inside handle regtion mouseClick(control, control.width/2, control.height/2) compare(control.value, 0.5) @@ -285,7 +285,7 @@ Item { function test_valueAndHandlePosition() { - var slider = Qt.createQmlObject('import QtQuick.Controls 1.1; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, ''); + var slider = Qt.createQmlObject('import QtQuick.Controls 1.2; Slider {minimumValue: 0; maximumValue: 100; width: 100; height: 20; stepSize: 1}', container, ''); slider.forceActiveFocus() slider.value = 0 compare(slider.__handlePos, 0) |