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/quick | |
| 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/quick')
10 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml index 92e27b9945..8374552974 100755 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Rectangle { id:container diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml index 48c4fb734c..1a8ca81ba0 100755 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Rectangle { id:container diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml index 7c4496b206..c5f9860fe2 100644 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_numberanimation.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Rectangle { id:container diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml index 1a17a1a908..87cba880af 100644 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Rectangle { id:container diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml index 59671f5145..4098af14f2 100644 --- a/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml +++ b/tests/auto/quick/qquickanimationcontroller/data/tst_sequentialanimation.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Rectangle { id:container diff --git a/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml b/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml index 000888a36f..5be221042e 100644 --- a/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml +++ b/tests/auto/quick/qquickcanvasitem/data/CanvasComponent.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Component { id:canvas diff --git a/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml b/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml index c8c2f4960f..b0cae69fe3 100644 --- a/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml +++ b/tests/auto/quick/qquickcanvasitem/data/CanvasTestCase.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 import QtQuick.Window 2.1 TestCase { diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml index b18250291e..f266c16d76 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_context.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_context.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 Canvas { id: canvas diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml index 487f7dc903..281264ba92 100644 --- a/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml +++ b/tests/auto/quick/qquickcanvasitem/data/tst_pixel.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 -import QtTest 1.0 +import QtTest 1.1 CanvasTestCase { id:testCase diff --git a/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml b/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml index c57cde5eda..c5fb53a3de 100644 --- a/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml +++ b/tests/auto/quick/qquicklistview/data/outsideViewportChangeNotAffectingView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtTest 1.0 +import QtTest 1.1 Item { width: 300 |