diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2012-06-18 17:07:43 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 05:42:12 +0200 |
commit | ed9ec54b0042ae78fb211c30bbcd268500730233 (patch) | |
tree | 827eff329f8dcd15ed26428f8bfd582595f26397 /tests | |
parent | 919d331c2365db0c6d3ca323313b6065a123e6a1 (diff) |
Update the Qt3D and Shapes version.
For the Qt5 release Qt3D will be bumped to 2.0 to match QML2.0 and thus
we need to apply this across all code and examples.
Task-Number: QTBUG-26183
Change-Id: Ief54cb6f39da97ccfeeccc56f93a77b25316f71e
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'tests')
47 files changed, 83 insertions, 83 deletions
diff --git a/tests/auto/qml3d/item3d/tst_item3d.qml b/tests/auto/qml3d/item3d/tst_item3d.qml index d4adcaa3a..00ca9da44 100644 --- a/tests/auto/qml3d/item3d/tst_item3d.qml +++ b/tests/auto/qml3d/item3d/tst_item3d.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml b/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml index 63e88766c..f45057442 100644 --- a/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml +++ b/tests/auto/qml3d/item3d/tst_item3d_local_v_world.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml b/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml index aa1a8739c..aa74806bb 100644 --- a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml +++ b/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt3D 1.0 +import Qt3D 2.0 import QtQuick 2.0 import QtTest 1.0 diff --git a/tests/auto/qml3d/lookat/tst_lookat.qml b/tests/auto/qml3d/lookat/tst_lookat.qml index 75210fb25..369e3bc8d 100644 --- a/tests/auto/qml3d/lookat/tst_lookat.qml +++ b/tests/auto/qml3d/lookat/tst_lookat.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d/mesh/tst_mesh.qml b/tests/auto/qml3d/mesh/tst_mesh.qml index a0103cc00..08d1bf680 100644 --- a/tests/auto/qml3d/mesh/tst_mesh.qml +++ b/tests/auto/qml3d/mesh/tst_mesh.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d/scale3d/tst_scale3d.qml b/tests/auto/qml3d/scale3d/tst_scale3d.qml index 2501c7ae9..5c934b48f 100644 --- a/tests/auto/qml3d/scale3d/tst_scale3d.qml +++ b/tests/auto/qml3d/scale3d/tst_scale3d.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d/sphere/tst_sphere.qml b/tests/auto/qml3d/sphere/tst_sphere.qml index 11d85eda1..53d4dd8d3 100644 --- a/tests/auto/qml3d/sphere/tst_sphere.qml +++ b/tests/auto/qml3d/sphere/tst_sphere.qml @@ -40,9 +40,9 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 -import Qt3D.Shapes 1.0 +import Qt3D.Shapes 2.0 Viewport { id: viewport diff --git a/tests/auto/qml3d/viewport/tst_viewport.qml b/tests/auto/qml3d/viewport/tst_viewport.qml index f91496567..55135cb3c 100644 --- a/tests/auto/qml3d/viewport/tst_viewport.qml +++ b/tests/auto/qml3d/viewport/tst_viewport.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d_visual/effect/tst_effect.qml b/tests/auto/qml3d_visual/effect/tst_effect.qml index f3749c6f1..8c3fe0947 100644 --- a/tests/auto/qml3d_visual/effect/tst_effect.qml +++ b/tests/auto/qml3d_visual/effect/tst_effect.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 Viewport { diff --git a/tests/auto/qml3d_visual/modelview/tst_modelview.qml b/tests/auto/qml3d_visual/modelview/tst_modelview.qml index 172eebe85..f7b0c8f25 100644 --- a/tests/auto/qml3d_visual/modelview/tst_modelview.qml +++ b/tests/auto/qml3d_visual/modelview/tst_modelview.qml @@ -40,9 +40,9 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 import QtTest 1.0 -import Qt3D.Shapes 1.0 +import Qt3D.Shapes 2.0 Rectangle { diff --git a/tests/auto/qml3d_visual/picking/tst_picking.qml b/tests/auto/qml3d_visual/picking/tst_picking.qml index 7275726bb..8a1fb3c1b 100644 --- a/tests/auto/qml3d_visual/picking/tst_picking.qml +++ b/tests/auto/qml3d_visual/picking/tst_picking.qml @@ -39,8 +39,8 @@ ** ****************************************************************************/ -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import QtTest 1.0 import QtQuick 2.0 diff --git a/tests/benchmarks/matrix_properties/data/matrix_component.qml b/tests/benchmarks/matrix_properties/data/matrix_component.qml index bb9064869..1ace63061 100644 --- a/tests/benchmarks/matrix_properties/data/matrix_component.qml +++ b/tests/benchmarks/matrix_properties/data/matrix_component.qml @@ -39,7 +39,7 @@ ** ****************************************************************************/ -import Qt3D 1.0 +import Qt3D 2.0 Item { CustomObject { id: theObject } diff --git a/tests/manual/animations/qml/TestAnimations.qml b/tests/manual/animations/qml/TestAnimations.qml index dfb9a2a9b..4e2d395da 100644 --- a/tests/manual/animations/qml/TestAnimations.qml +++ b/tests/manual/animations/qml/TestAnimations.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-18702 Item { diff --git a/tests/manual/animations/qml/TestCase.qml b/tests/manual/animations/qml/TestCase.qml index 8285a0d1c..6c99cd388 100644 --- a/tests/manual/animations/qml/TestCase.qml +++ b/tests/manual/animations/qml/TestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/animations/qml/desktop.qml b/tests/manual/animations/qml/desktop.qml index 76b93dc50..80d0a4ec0 100644 --- a/tests/manual/animations/qml/desktop.qml +++ b/tests/manual/animations/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/background/qml/TestBackground.qml b/tests/manual/background/qml/TestBackground.qml index ecc705a48..b8ff61f34 100644 --- a/tests/manual/background/qml/TestBackground.qml +++ b/tests/manual/background/qml/TestBackground.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Image { width: parent.width diff --git a/tests/manual/background/qml/desktop.qml b/tests/manual/background/qml/desktop.qml index 811b30e7b..ff343a612 100644 --- a/tests/manual/background/qml/desktop.qml +++ b/tests/manual/background/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/basic/qml/TestBasic.qml b/tests/manual/basic/qml/TestBasic.qml index 0b8cdf82f..578be2168 100644 --- a/tests/manual/basic/qml/TestBasic.qml +++ b/tests/manual/basic/qml/TestBasic.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Item { id: screen diff --git a/tests/manual/basic/qml/desktop.qml b/tests/manual/basic/qml/desktop.qml index 85f03e2b9..8b61c2ec9 100644 --- a/tests/manual/basic/qml/desktop.qml +++ b/tests/manual/basic/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/displaymodel/qml/TestDisplayModel.qml b/tests/manual/displaymodel/qml/TestDisplayModel.qml index b69f3aa50..60c534bd0 100644 --- a/tests/manual/displaymodel/qml/TestDisplayModel.qml +++ b/tests/manual/displaymodel/qml/TestDisplayModel.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-17392 / QTBUG-17391 Item { diff --git a/tests/manual/displaymodel/qml/desktop.qml b/tests/manual/displaymodel/qml/desktop.qml index 2993b5fe4..0587d42d9 100644 --- a/tests/manual/displaymodel/qml/desktop.qml +++ b/tests/manual/displaymodel/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/fullreferencing/qml/TestFullReferencing.qml b/tests/manual/fullreferencing/qml/TestFullReferencing.qml index 391d7742e..5e8f0274d 100644 --- a/tests/manual/fullreferencing/qml/TestFullReferencing.qml +++ b/tests/manual/fullreferencing/qml/TestFullReferencing.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: screen diff --git a/tests/manual/fullreferencing/qml/desktop.qml b/tests/manual/fullreferencing/qml/desktop.qml index 698d7ef69..2b16eda17 100644 --- a/tests/manual/fullreferencing/qml/desktop.qml +++ b/tests/manual/fullreferencing/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/model3ds/qml/TestModel3ds.qml b/tests/manual/model3ds/qml/TestModel3ds.qml index 2dcc42aaa..982cb475a 100644 --- a/tests/manual/model3ds/qml/TestModel3ds.qml +++ b/tests/manual/model3ds/qml/TestModel3ds.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-17392 / QTBUG-17391 Item { diff --git a/tests/manual/model3ds/qml/desktop.qml b/tests/manual/model3ds/qml/desktop.qml index dbd1b8bb0..28409a8d3 100644 --- a/tests/manual/model3ds/qml/desktop.qml +++ b/tests/manual/model3ds/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/navigation1/qml/TestNavigation1.qml b/tests/manual/navigation1/qml/TestNavigation1.qml index 4ec1bf1d1..d032591cc 100644 --- a/tests/manual/navigation1/qml/TestNavigation1.qml +++ b/tests/manual/navigation1/qml/TestNavigation1.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-17408 TEST Item { diff --git a/tests/manual/navigation1/qml/desktop.qml b/tests/manual/navigation1/qml/desktop.qml index fbd53c762..92c35f267 100644 --- a/tests/manual/navigation1/qml/desktop.qml +++ b/tests/manual/navigation1/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/qrc/qml/tst_qrc.qml b/tests/manual/qrc/qml/tst_qrc.qml index cf79dea53..84ffaee21 100644 --- a/tests/manual/qrc/qml/tst_qrc.qml +++ b/tests/manual/qrc/qml/tst_qrc.qml @@ -39,8 +39,8 @@ ****************************************************************************/ //! [1] import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Viewport { width: 640; height: 480 diff --git a/tests/manual/rotation/qml/TestCase.qml b/tests/manual/rotation/qml/TestCase.qml index 731c473e7..132f5bafa 100644 --- a/tests/manual/rotation/qml/TestCase.qml +++ b/tests/manual/rotation/qml/TestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/rotation/qml/TestRotation.qml b/tests/manual/rotation/qml/TestRotation.qml index 3e338bc38..2ec94cf28 100644 --- a/tests/manual/rotation/qml/TestRotation.qml +++ b/tests/manual/rotation/qml/TestRotation.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-17408 Item { diff --git a/tests/manual/rotation/qml/desktop.qml b/tests/manual/rotation/qml/desktop.qml index 6897fb01b..3ffc79479 100644 --- a/tests/manual/rotation/qml/desktop.qml +++ b/tests/manual/rotation/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/scaling/qml/ScalingTestCase.qml b/tests/manual/scaling/qml/ScalingTestCase.qml index 73927ad42..b514fd679 100644 --- a/tests/manual/scaling/qml/ScalingTestCase.qml +++ b/tests/manual/scaling/qml/ScalingTestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/scaling/qml/TestScaling.qml b/tests/manual/scaling/qml/TestScaling.qml index cc0bd6293..6749945f1 100644 --- a/tests/manual/scaling/qml/TestScaling.qml +++ b/tests/manual/scaling/qml/TestScaling.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-17408 Item { diff --git a/tests/manual/scaling/qml/desktop.qml b/tests/manual/scaling/qml/desktop.qml index fe2027f10..b1d6fb4fc 100644 --- a/tests/manual/scaling/qml/desktop.qml +++ b/tests/manual/scaling/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/shapes/qml/TestShapes.qml b/tests/manual/shapes/qml/TestShapes.qml index 4c455c3ce..4600559f8 100644 --- a/tests/manual/shapes/qml/TestShapes.qml +++ b/tests/manual/shapes/qml/TestShapes.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Item { id: screen diff --git a/tests/manual/shapes/qml/desktop.qml b/tests/manual/shapes/qml/desktop.qml index 90236926a..7ddbece65 100644 --- a/tests/manual/shapes/qml/desktop.qml +++ b/tests/manual/shapes/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/submesh/qml/TestSubmesh.qml b/tests/manual/submesh/qml/TestSubmesh.qml index 854c1a222..6494b2a0d 100644 --- a/tests/manual/submesh/qml/TestSubmesh.qml +++ b/tests/manual/submesh/qml/TestSubmesh.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 // QTBUG-17418 Item { diff --git a/tests/manual/submesh/qml/desktop.qml b/tests/manual/submesh/qml/desktop.qml index 332c50ba0..2e6695c1c 100644 --- a/tests/manual/submesh/qml/desktop.qml +++ b/tests/manual/submesh/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml b/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml index c11677ea7..c17074e7d 100644 --- a/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml +++ b/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/transformations/qml/TestTransformations.qml b/tests/manual/transformations/qml/TestTransformations.qml index 61502fb93..78de46447 100644 --- a/tests/manual/transformations/qml/TestTransformations.qml +++ b/tests/manual/transformations/qml/TestTransformations.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 +import Qt3D 2.0 // QTBUG-17408 Flickable { diff --git a/tests/manual/transformations/qml/TransformationListTestCase.qml b/tests/manual/transformations/qml/TransformationListTestCase.qml index 8fd4cfdbc..182d61f05 100644 --- a/tests/manual/transformations/qml/TransformationListTestCase.qml +++ b/tests/manual/transformations/qml/TransformationListTestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/transformations/qml/desktop.qml b/tests/manual/transformations/qml/desktop.qml index 22c8c5057..bcb1ccf60 100644 --- a/tests/manual/transformations/qml/desktop.qml +++ b/tests/manual/transformations/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { diff --git a/tests/manual/translation/qml/AxesVsVectorTestCase.qml b/tests/manual/translation/qml/AxesVsVectorTestCase.qml index 5696e9187..328141c52 100644 --- a/tests/manual/translation/qml/AxesVsVectorTestCase.qml +++ b/tests/manual/translation/qml/AxesVsVectorTestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/translation/qml/TestTranslation.qml b/tests/manual/translation/qml/TestTranslation.qml index b3d4ed305..9a6efc0dd 100644 --- a/tests/manual/translation/qml/TestTranslation.qml +++ b/tests/manual/translation/qml/TestTranslation.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 // QTBUG-17408 Item { diff --git a/tests/manual/translation/qml/TranslationTestCase.qml b/tests/manual/translation/qml/TranslationTestCase.qml index 396a7cc96..319f25b9a 100644 --- a/tests/manual/translation/qml/TranslationTestCase.qml +++ b/tests/manual/translation/qml/TranslationTestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/translation/qml/TranslationVectorTestCase.qml b/tests/manual/translation/qml/TranslationVectorTestCase.qml index 38d2bf8c4..bc4eda959 100644 --- a/tests/manual/translation/qml/TranslationVectorTestCase.qml +++ b/tests/manual/translation/qml/TranslationVectorTestCase.qml @@ -40,8 +40,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 Rectangle { id: container diff --git a/tests/manual/translation/qml/desktop.qml b/tests/manual/translation/qml/desktop.qml index 7763c52ba..6a13496a5 100644 --- a/tests/manual/translation/qml/desktop.qml +++ b/tests/manual/translation/qml/desktop.qml @@ -39,8 +39,8 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 1.0 -import Qt3D.Shapes 1.0 +import Qt3D 2.0 +import Qt3D.Shapes 2.0 import "." Item { |