diff options
| author | Julian de Bhal <julian.debhal@nokia.com> | 2012-02-09 16:35:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 07:34:26 +0100 |
| commit | 255e3ef5ed16ce092958a1ef10be6d6c26040cd5 (patch) | |
| tree | e7f639c87c077368308501ce300a05117acfae95 /tutorials | |
| parent | 0155dfdebe926890ff49da7724dfc23ebf7364ab (diff) | |
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>
Diffstat (limited to 'tutorials')
10 files changed, 9 insertions, 10 deletions
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] |