Update qml import statements.

Changed all instances of "import QtQuick 1.0" to 2.0, and removed all
instances of "import Qt 4.7"

Change-Id: I2a8a3022e4596e9d9957f242c98c2e483467e206
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

43 files changed, 37 insertions, 44 deletions

diff --git a/doc/src/acceptance/qt3d-acceptance.qdoc b/doc/src/acceptance/qt3d-acceptance.qdoc
index df6c648e7..14187e698 100644
--- a/doc/src/acceptance/qt3d-acceptance.qdoc
+++ b/doc/src/acceptance/qt3d-acceptance.qdoc
@@ -64,7 +64,7 @@
     appears as follows:
 
     \code
-        import QtQuick 1.0
+        import QtQuick 2.0
         import Qt3D 1.0
 
         Viewport { width: 400; height: 400 }
diff --git a/examples/quick3d/lander/qml/Jet.qml b/examples/quick3d/lander/qml/Jet.qml
index 19fe0e3b0..09b0e2be2 100644
--- a/examples/quick3d/lander/qml/Jet.qml
+++ b/examples/quick3d/lander/qml/Jet.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml b/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml
index ca64c09d3..1e379d9a3 100644
--- a/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml
+++ b/examples/quick3d/solarsystem_qml/qml/solarsystem_qml.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //! [1]
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/examples/quick3d/sphere/qml/Sphere.qml b/examples/quick3d/sphere/qml/Sphere.qml
index 00fe63431..66517b6f0 100644
--- a/examples/quick3d/sphere/qml/Sphere.qml
+++ b/examples/quick3d/sphere/qml/Sphere.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/src/imports/shapes/Capsule.qml b/src/imports/shapes/Capsule.qml
index 0936c7af0..1669ac889 100644
--- a/src/imports/shapes/Capsule.qml
+++ b/src/imports/shapes/Capsule.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/src/imports/shapes/Cube.qml b/src/imports/shapes/Cube.qml
index 2b3325b8a..1698889a8 100644
--- a/src/imports/shapes/Cube.qml
+++ b/src/imports/shapes/Cube.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Item3D {
diff --git a/src/imports/shapes/Cylinder.qml b/src/imports/shapes/Cylinder.qml
index 0da6d4d85..a9634b136 100644
--- a/src/imports/shapes/Cylinder.qml
+++ b/src/imports/shapes/Cylinder.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/src/imports/shapes/Quad.qml b/src/imports/shapes/Quad.qml
index 952d2fe8f..8cf7319bb 100644
--- a/src/imports/shapes/Quad.qml
+++ b/src/imports/shapes/Quad.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Item3D {
diff --git a/src/imports/shapes/Sphere.qml b/src/imports/shapes/Sphere.qml
index 9f31ca91f..79644e919 100644
--- a/src/imports/shapes/Sphere.qml
+++ b/src/imports/shapes/Sphere.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/src/imports/shapes/Teapot.qml b/src/imports/shapes/Teapot.qml
index f152d588f..11b1f70bf 100644
--- a/src/imports/shapes/Teapot.qml
+++ b/src/imports/shapes/Teapot.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Item3D {
diff --git a/src/imports/threed/DefaultNavigator.qml b/src/imports/threed/DefaultNavigator.qml
index 1cb18357f..a858eeda6 100644
--- a/src/imports/threed/DefaultNavigator.qml
+++ b/src/imports/threed/DefaultNavigator.qml
@@ -38,7 +38,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
 import Qt3D 1.0
 
 // This is an example of how to implement a custom navigation strategy
diff --git a/src/imports/threed/viewport.cpp b/src/imports/threed/viewport.cpp
index 104e7e6e6..6fd496910 100644
--- a/src/imports/threed/viewport.cpp
+++ b/src/imports/threed/viewport.cpp
@@ -76,7 +76,7 @@
     the size of the view, the camera position, lights, and the main 3D object:
 
     \code
-    import QtQuick 1.0
+    import QtQuick 2.0
     import Qt3D 1.0
 
     Viewport {
diff --git a/src/threed/viewing/qglcamera.cpp b/src/threed/viewing/qglcamera.cpp
index b8897a4af..09729baca 100644
--- a/src/threed/viewing/qglcamera.cpp
+++ b/src/threed/viewing/qglcamera.cpp
@@ -305,7 +305,7 @@ QT_BEGIN_NAMESPACE
     Viewport::camera property:
 
     \code
-    import QtQuick 1.0
+    import QtQuick 2.0
     import Qt3D 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 8857a16d3..615039ff0 100644
--- a/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml
+++ b/tests/auto/qml3d/item3d/tst_missing_texture_coordinates.qml
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
 import Qt3D 1.0
 
 Viewport  {
diff --git a/tests/auto/qml3d/picking/tst_picking.qml b/tests/auto/qml3d/picking/tst_picking.qml
index 989c82b97..6539f85b0 100644
--- a/tests/auto/qml3d/picking/tst_picking.qml
+++ b/tests/auto/qml3d/picking/tst_picking.qml
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 import QtQuickTest 1.0
diff --git a/tests/benchmarks/matrix_properties/data/CustomObject.qml b/tests/benchmarks/matrix_properties/data/CustomObject.qml
index f1682f04a..d76cac0c1 100644
--- a/tests/benchmarks/matrix_properties/data/CustomObject.qml
+++ b/tests/benchmarks/matrix_properties/data/CustomObject.qml
@@ -39,8 +39,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
-
 QtObject {
     property variant variantProp: 0
 }
diff --git a/tests/benchmarks/matrix_properties/data/matrix_component.qml b/tests/benchmarks/matrix_properties/data/matrix_component.qml
index f923f7670..05faccdde 100644
--- a/tests/benchmarks/matrix_properties/data/matrix_component.qml
+++ b/tests/benchmarks/matrix_properties/data/matrix_component.qml
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-import Qt 4.7
 import Qt3D 1.0
 
 Item {
diff --git a/tests/manual/animations/qml/TestCase.qml b/tests/manual/animations/qml/TestCase.qml
index 0ce354a22..5dde547cb 100644
--- a/tests/manual/animations/qml/TestCase.qml
+++ b/tests/manual/animations/qml/TestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/animations/qml/tst_animations.qml b/tests/manual/animations/qml/tst_animations.qml
index 10369b13e..a8ba5efe7 100644
--- a/tests/manual/animations/qml/tst_animations.qml
+++ b/tests/manual/animations/qml/tst_animations.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/model3ds/qml/tst_model3ds.qml b/tests/manual/model3ds/qml/tst_model3ds.qml
index 1026d90e3..2dcc42aaa 100644
--- a/tests/manual/model3ds/qml/tst_model3ds.qml
+++ b/tests/manual/model3ds/qml/tst_model3ds.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/navigation1/qml/tst_navigation1.qml b/tests/manual/navigation1/qml/tst_navigation1.qml
index fb68d4ba5..4ec1bf1d1 100644
--- a/tests/manual/navigation1/qml/tst_navigation1.qml
+++ b/tests/manual/navigation1/qml/tst_navigation1.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/qrc/qml/cube.qml b/tests/manual/qrc/qml/cube.qml
index b34980043..cf79dea53 100644
--- a/tests/manual/qrc/qml/cube.qml
+++ b/tests/manual/qrc/qml/cube.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //! [1]
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/scaling/qml/ScalingTestCase.qml b/tests/manual/scaling/qml/ScalingTestCase.qml
index b2bf90833..73927ad42 100644
--- a/tests/manual/scaling/qml/ScalingTestCase.qml
+++ b/tests/manual/scaling/qml/ScalingTestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/scaling/qml/tst_scaling.qml b/tests/manual/scaling/qml/tst_scaling.qml
index aaeba7c2c..cc0bd6293 100644
--- a/tests/manual/scaling/qml/tst_scaling.qml
+++ b/tests/manual/scaling/qml/tst_scaling.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/shapes/qml/tst_shapes.qml b/tests/manual/shapes/qml/tst_shapes.qml
index 647f1d423..463b05bd1 100644
--- a/tests/manual/shapes/qml/tst_shapes.qml
+++ b/tests/manual/shapes/qml/tst_shapes.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/submesh/qml/tst_submesh.qml b/tests/manual/submesh/qml/tst_submesh.qml
index 9d30dcde1..854c1a222 100644
--- a/tests/manual/submesh/qml/tst_submesh.qml
+++ b/tests/manual/submesh/qml/tst_submesh.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 // QTBUG-17418
diff --git a/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml b/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml
index 62a2dcdf8..c11677ea7 100644
--- a/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml
+++ b/tests/manual/transformations/qml/ComposedItemTransformationsTestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/transformations/qml/TransformationListTestCase.qml b/tests/manual/transformations/qml/TransformationListTestCase.qml
index fdd19090d..8fd4cfdbc 100644
--- a/tests/manual/transformations/qml/TransformationListTestCase.qml
+++ b/tests/manual/transformations/qml/TransformationListTestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/transformations/qml/tst_transformations.qml b/tests/manual/transformations/qml/tst_transformations.qml
index 0d55382b6..61502fb93 100644
--- a/tests/manual/transformations/qml/tst_transformations.qml
+++ b/tests/manual/transformations/qml/tst_transformations.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 // QTBUG-17408
diff --git a/tests/manual/translation/qml/AxesVsVectorTestCase.qml b/tests/manual/translation/qml/AxesVsVectorTestCase.qml
index 2509633e8..5696e9187 100644
--- a/tests/manual/translation/qml/AxesVsVectorTestCase.qml
+++ b/tests/manual/translation/qml/AxesVsVectorTestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/translation/qml/TranslationTestCase.qml b/tests/manual/translation/qml/TranslationTestCase.qml
index fb865e65e..396a7cc96 100644
--- a/tests/manual/translation/qml/TranslationTestCase.qml
+++ b/tests/manual/translation/qml/TranslationTestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/translation/qml/TranslationVectorTestCase.qml b/tests/manual/translation/qml/TranslationVectorTestCase.qml
index 711e38f8e..38d2bf8c4 100644
--- a/tests/manual/translation/qml/TranslationVectorTestCase.qml
+++ b/tests/manual/translation/qml/TranslationVectorTestCase.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tests/manual/translation/qml/tst_translation.qml b/tests/manual/translation/qml/tst_translation.qml
index 281231886..b3d4ed305 100644
--- a/tests/manual/translation/qml/tst_translation.qml
+++ b/tests/manual/translation/qml/tst_translation.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tutorials/qt3d/cube4/cube.qml b/tutorials/qt3d/cube4/cube.qml
index 44655cd6e..220adae99 100644
--- a/tutorials/qt3d/cube4/cube.qml
+++ b/tutorials/qt3d/cube4/cube.qml
@@ -39,7 +39,6 @@
 ****************************************************************************/
 
 //! [1]
-import Qt 4.7
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tutorials/quick3d/shaders/TutorialTeapot.qml b/tutorials/quick3d/shaders/TutorialTeapot.qml
index 8286dbe2c..246aa2675 100644
--- a/tutorials/quick3d/shaders/TutorialTeapot.qml
+++ b/tutorials/quick3d/shaders/TutorialTeapot.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Item3D {
diff --git a/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml b/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml
index 2cf7e3052..2be310ef1 100644
--- a/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-1-textures.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
diff --git a/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml b/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml
index 2ef2dedfb..49137ea6f 100644
--- a/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-2-vertex-shader.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
diff --git a/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml b/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml
index 0afc32366..efe4aabb2 100644
--- a/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-3-transformed-coordinates.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
diff --git a/tutorials/quick3d/shaders/shader-tutorial-lighting.qml b/tutorials/quick3d/shaders/shader-tutorial-lighting.qml
index 9eae63fcf..87a55d613 100644
--- a/tutorials/quick3d/shaders/shader-tutorial-lighting.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-lighting.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 import Qt3D.Shapes 1.0
 
diff --git a/tutorials/quick3d/shaders/shader-tutorial-varying.qml b/tutorials/quick3d/shaders/shader-tutorial-varying.qml
index a2b53ebff..fea323167 100644
--- a/tutorials/quick3d/shaders/shader-tutorial-varying.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial-varying.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
diff --git a/tutorials/quick3d/shaders/shader-tutorial.qml b/tutorials/quick3d/shaders/shader-tutorial.qml
index 2d540571b..b5e83227f 100644
--- a/tutorials/quick3d/shaders/shader-tutorial.qml
+++ b/tutorials/quick3d/shaders/shader-tutorial.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 //! [1]
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
diff --git a/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml b/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml
index d32adc0c2..16cbd08a9 100644
--- a/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml
+++ b/tutorials/quick3d/teapot_bounce_qml/qml/teapot-bounce.qml
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 
 Viewport {
diff --git a/tutorials/quick3d/teapot_qml/qml/teapot.qml b/tutorials/quick3d/teapot_qml/qml/teapot.qml
index c5112b6f6..8e68e5219 100644
--- a/tutorials/quick3d/teapot_qml/qml/teapot.qml
+++ b/tutorials/quick3d/teapot_qml/qml/teapot.qml
@@ -40,7 +40,7 @@
 
 //![1]
 //![2]
-import QtQuick 1.0
+import QtQuick 2.0
 import Qt3D 1.0
 //![2]