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>

12 files changed, 18 insertions, 18 deletions

diff --git a/demos/quick3d/flickr3d/qml/Flickr3d.qml b/demos/quick3d/flickr3d/qml/Flickr3d.qml
index 91eb898cb..00c4057d2 100644
--- a/demos/quick3d/flickr3d/qml/Flickr3d.qml
+++ b/demos/quick3d/flickr3d/qml/Flickr3d.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
 
 Viewport {
     width: parent.width
diff --git a/demos/quick3d/flickr3d/qml/desktop.qml b/demos/quick3d/flickr3d/qml/desktop.qml
index fa4dcb0ce..bb82eb231 100644
--- a/demos/quick3d/flickr3d/qml/desktop.qml
+++ b/demos/quick3d/flickr3d/qml/desktop.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
 import "."
 
 Item {
diff --git a/demos/quick3d/robo_bounce/qml/PushButton.qml b/demos/quick3d/robo_bounce/qml/PushButton.qml
index 0150dfb76..23273bbb5 100644
--- a/demos/quick3d/robo_bounce/qml/PushButton.qml
+++ b/demos/quick3d/robo_bounce/qml/PushButton.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt3D 1.0
+import Qt3D 2.0
 
 Image {
     id: theButton
diff --git a/demos/quick3d/robo_bounce/qml/QMLPanels.qml b/demos/quick3d/robo_bounce/qml/QMLPanels.qml
index f71c6cca9..aba17a623 100644
--- a/demos/quick3d/robo_bounce/qml/QMLPanels.qml
+++ b/demos/quick3d/robo_bounce/qml/QMLPanels.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt3D 1.0
+import Qt3D 2.0
 
 Item {
     Rectangle {
diff --git a/demos/quick3d/robo_bounce/qml/RoboBounce.qml b/demos/quick3d/robo_bounce/qml/RoboBounce.qml
index 48f04551a..929274b10 100644
--- a/demos/quick3d/robo_bounce/qml/RoboBounce.qml
+++ b/demos/quick3d/robo_bounce/qml/RoboBounce.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 {
     objectName: "tronscape image"
diff --git a/demos/quick3d/robo_bounce/qml/Robot.qml b/demos/quick3d/robo_bounce/qml/Robot.qml
index 72587e3d6..780a184b1 100644
--- a/demos/quick3d/robo_bounce/qml/Robot.qml
+++ b/demos/quick3d/robo_bounce/qml/Robot.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt3D 1.0
+import Qt3D 2.0
 
 Item3D {
     id: robot1
diff --git a/demos/quick3d/robo_bounce/qml/TronCube.qml b/demos/quick3d/robo_bounce/qml/TronCube.qml
index 13405d498..e39f43cc3 100644
--- a/demos/quick3d/robo_bounce/qml/TronCube.qml
+++ b/demos/quick3d/robo_bounce/qml/TronCube.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
 
 Cube {
     effect: Effect {color: "#aaaaaa"; texture: "meshes/qtlogo.png"; decal: true}
diff --git a/demos/quick3d/robo_bounce/qml/desktop.qml b/demos/quick3d/robo_bounce/qml/desktop.qml
index 184ec98e1..fa5936298 100644
--- a/demos/quick3d/robo_bounce/qml/desktop.qml
+++ b/demos/quick3d/robo_bounce/qml/desktop.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
 import "."
 
 Item {
diff --git a/demos/quick3d/tea_service/qml/TeaService.qml b/demos/quick3d/tea_service/qml/TeaService.qml
index 3f39b4040..49943cef3 100644
--- a/demos/quick3d/tea_service/qml/TeaService.qml
+++ b/demos/quick3d/tea_service/qml/TeaService.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt3D 1.0
+import Qt3D 2.0
 
 
 Viewport {
diff --git a/demos/quick3d/tea_service/qml/Teacup.qml b/demos/quick3d/tea_service/qml/Teacup.qml
index fd3e9fae6..4e786c861 100644
--- a/demos/quick3d/tea_service/qml/Teacup.qml
+++ b/demos/quick3d/tea_service/qml/Teacup.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt3D 1.0
+import Qt3D 2.0
 
 Item3D {
     id: top
diff --git a/demos/quick3d/tea_service/qml/Teaspoon.qml b/demos/quick3d/tea_service/qml/Teaspoon.qml
index 2aab89f94..ba8e9abe0 100644
--- a/demos/quick3d/tea_service/qml/Teaspoon.qml
+++ b/demos/quick3d/tea_service/qml/Teaspoon.qml
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import Qt3D 1.0
+import Qt3D 2.0
 
 Item3D {
     id: "top"
diff --git a/demos/quick3d/tea_service/qml/desktop.qml b/demos/quick3d/tea_service/qml/desktop.qml
index 886569d72..a5668f330 100644
--- a/demos/quick3d/tea_service/qml/desktop.qml
+++ b/demos/quick3d/tea_service/qml/desktop.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
 import "."
 
 Item {