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 /src | |
| 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 'src')
| -rw-r--r-- | src/imports/shapes/Capsule.qml | 2 | ||||
| -rw-r--r-- | src/imports/shapes/Cube.qml | 2 | ||||
| -rw-r--r-- | src/imports/shapes/Cylinder.qml | 2 | ||||
| -rw-r--r-- | src/imports/shapes/Quad.qml | 2 | ||||
| -rw-r--r-- | src/imports/shapes/Sphere.qml | 2 | ||||
| -rw-r--r-- | src/imports/shapes/Teapot.qml | 2 | ||||
| -rw-r--r-- | src/imports/threed/DefaultNavigator.qml | 1 | ||||
| -rw-r--r-- | src/imports/threed/viewport.cpp | 2 | ||||
| -rw-r--r-- | src/threed/viewing/qglcamera.cpp | 2 |
9 files changed, 8 insertions, 9 deletions
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 { |