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>

11 files changed, 14 insertions, 14 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