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_button.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_button.qml')
-rw-r--r-- | tests/auto/controls/data/tst_button.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index ad06045e..edc1f308 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -55,18 +55,18 @@ TestCase { height:400 function test_isDefault() { - var tmp = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button1}', testCase, ''); + var tmp = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {id: button1}', testCase, ''); compare(tmp.isDefault, false); tmp.destroy() } function test_text() { - var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_1}', testCase, ''); + var tmp1 = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {id: button2_1}', testCase, ''); compare(tmp1.text, ""); tmp1.text = "Hello"; compare(tmp1.text, "Hello"); - var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {id: button2_2; text: "Hello"}', testCase, ''); + var tmp2 = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {id: button2_2; text: "Hello"}', testCase, ''); compare(tmp2.text, "Hello"); tmp1.destroy() tmp2.destroy() @@ -80,7 +80,7 @@ TestCase { function test_action() { var test_actionStr = 'import QtQuick 2.2; \ - import QtQuick.Controls 1.1; \ + import QtQuick.Controls 1.2; \ Item { \ property var testAction: Action { \ id: testAction; \ @@ -110,7 +110,7 @@ TestCase { } function test_activeFocusOnPress(){ - var control = Qt.createQmlObject('import QtQuick.Controls 1.1; Button {x: 20; y: 20; width: 100; height: 50}', container, '') + var control = Qt.createQmlObject('import QtQuick.Controls 1.2; Button {x: 20; y: 20; width: 100; height: 50}', container, '') control.activeFocusOnPress = false verify(!control.activeFocus) mouseClick(control, 30, 30) @@ -127,7 +127,7 @@ TestCase { 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; \ @@ -204,7 +204,7 @@ TestCase { } function test_checked() { - var button = Qt.createQmlObject('import QtQuick.Controls 1.1; Button { checkable: true }', container, '') + var button = Qt.createQmlObject('import QtQuick.Controls 1.2; Button { checkable: true }', container, '') var checkCount = 0 |