diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-09 09:53:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-12-09 11:43:35 +0100 |
| commit | 14f0efa0aea942b4483796d42e618366257f7a36 (patch) | |
| tree | b0a1ebfbb70c07bdb0041e48e2852f241724d439 /tests/auto/qmltest/statemachine | |
| parent | 87e4279651cf691e82f266d61330f8daf4300da2 (diff) | |
| parent | e701690f79a7a0eecdb98d32c8f5130b67637256 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.4.0' into 5.4" into refs/staging/5.4
Diffstat (limited to 'tests/auto/qmltest/statemachine')
8 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/qmltest/statemachine/tst_anonymousstate.qml b/tests/auto/qmltest/statemachine/tst_anonymousstate.qml index b05d5c67a9..e5fab06409 100644 --- a/tests/auto/qmltest/statemachine/tst_anonymousstate.qml +++ b/tests/auto/qmltest/statemachine/tst_anonymousstate.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_guardcondition.qml b/tests/auto/qmltest/statemachine/tst_guardcondition.qml index 0390b5f8fa..abe348aa8d 100644 --- a/tests/auto/qmltest/statemachine/tst_guardcondition.qml +++ b/tests/auto/qmltest/statemachine/tst_guardcondition.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_historystate.qml b/tests/auto/qmltest/statemachine/tst_historystate.qml index 6e2aa70417..1da554c9bb 100644 --- a/tests/auto/qmltest/statemachine/tst_historystate.qml +++ b/tests/auto/qmltest/statemachine/tst_historystate.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_initialstate.qml b/tests/auto/qmltest/statemachine/tst_initialstate.qml index c08b3f7001..a1fa6f2d55 100644 --- a/tests/auto/qmltest/statemachine/tst_initialstate.qml +++ b/tests/auto/qmltest/statemachine/tst_initialstate.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml b/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml index 443771f8f4..792ddd33bc 100644 --- a/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml +++ b/tests/auto/qmltest/statemachine/tst_nestedinitialstates.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml b/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml index f584b7cd01..f123f3f3af 100644 --- a/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml +++ b/tests/auto/qmltest/statemachine/tst_nestedstatemachine.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml index 2e3a5efdfd..1926b100b6 100644 --- a/tests/auto/qmltest/statemachine/tst_parallelmachine.qml +++ b/tests/auto/qmltest/statemachine/tst_parallelmachine.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { diff --git a/tests/auto/qmltest/statemachine/tst_trafficlight.qml b/tests/auto/qmltest/statemachine/tst_trafficlight.qml index 3f731a4014..6e2eebb354 100644 --- a/tests/auto/qmltest/statemachine/tst_trafficlight.qml +++ b/tests/auto/qmltest/statemachine/tst_trafficlight.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtTest 1.0 +import QtTest 1.1 import QtQml.StateMachine 1.0 TestCase { |