diff options
Diffstat (limited to 'examples')
29 files changed, 3 insertions, 174 deletions
diff --git a/examples/assimp/main.qml b/examples/assimp/main.qml index b2af7c938..cbcef849d 100644 --- a/examples/assimp/main.qml +++ b/examples/assimp/main.qml @@ -41,7 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/bigmodel-qml/main.qml b/examples/bigmodel-qml/main.qml index eb8c7927f..db27905dc 100644 --- a/examples/bigmodel-qml/main.qml +++ b/examples/bigmodel-qml/main.qml @@ -41,14 +41,7 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.2 as QQ2 -import QtQml 2.2 Entity { id: sceneRoot diff --git a/examples/cylinder-qml/main.qml b/examples/cylinder-qml/main.qml index 0d5595d47..0b8665d9d 100644 --- a/examples/cylinder-qml/main.qml +++ b/examples/cylinder-qml/main.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - Entity { id: sceneRoot diff --git a/examples/deferred-renderer-qml/SceneEffect.qml b/examples/deferred-renderer-qml/SceneEffect.qml index 0540c8ba1..ef9884822 100644 --- a/examples/deferred-renderer-qml/SceneEffect.qml +++ b/examples/deferred-renderer-qml/SceneEffect.qml @@ -1,6 +1,3 @@ -import Qt3D 2.0 -import Qt3D.Render 2.0 - /**************************************************************************** ** ** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). @@ -42,6 +39,9 @@ import Qt3D.Render 2.0 ** ****************************************************************************/ +import Qt3D 2.0 +import Qt3D.Render 2.0 + Effect { id : sceneMaterialEffect techniques : [ diff --git a/examples/deferred-renderer-qml/main.qml b/examples/deferred-renderer-qml/main.qml index 27c03489a..4cb8c9fb1 100644 --- a/examples/deferred-renderer-qml/main.qml +++ b/examples/deferred-renderer-qml/main.qml @@ -39,7 +39,6 @@ ** ****************************************************************************/ -import QtQuick 2.2 as QQ2 import Qt3D 2.0 import Qt3D.Render 2.0 diff --git a/examples/gltf/main.qml b/examples/gltf/main.qml index 857465565..850124cfd 100644 --- a/examples/gltf/main.qml +++ b/examples/gltf/main.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/playground-qml/main.qml b/examples/playground-qml/main.qml index c819a04c5..f47c509b6 100644 --- a/examples/playground-qml/main.qml +++ b/examples/playground-qml/main.qml @@ -41,13 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.2 as QQ2 import QtQml 2.2 diff --git a/examples/rollerball/AdsEffect.qml b/examples/rollerball/AdsEffect.qml index aa7c265af..146fac14d 100644 --- a/examples/rollerball/AdsEffect.qml +++ b/examples/rollerball/AdsEffect.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 - Effect { id: root diff --git a/examples/rollerball/main.qml b/examples/rollerball/main.qml index 950085d3e..7c88a11a2 100644 --- a/examples/rollerball/main.qml +++ b/examples/rollerball/main.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - Entity { id: root objectName: "root" diff --git a/examples/shadow-map-qml/AdsEffect.qml b/examples/shadow-map-qml/AdsEffect.qml index 88d38294d..d92144593 100644 --- a/examples/shadow-map-qml/AdsEffect.qml +++ b/examples/shadow-map-qml/AdsEffect.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 - Effect { id: root diff --git a/examples/shadow-map-qml/AdsMaterial.qml b/examples/shadow-map-qml/AdsMaterial.qml index c9ce2f5d5..1f98c9425 100644 --- a/examples/shadow-map-qml/AdsMaterial.qml +++ b/examples/shadow-map-qml/AdsMaterial.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 Material { diff --git a/examples/shadow-map-qml/GroundPlane.qml b/examples/shadow-map-qml/GroundPlane.qml index e42adb72f..919fb9640 100644 --- a/examples/shadow-map-qml/GroundPlane.qml +++ b/examples/shadow-map-qml/GroundPlane.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - Entity { id: root property Material material diff --git a/examples/shadow-map-qml/Light.qml b/examples/shadow-map-qml/Light.qml index 190cfdf14..625a8e677 100644 --- a/examples/shadow-map-qml/Light.qml +++ b/examples/shadow-map-qml/Light.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - Entity { id: root diff --git a/examples/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/shadow-map-qml/ShadowMapFrameGraph.qml index 04cc97cbe..8aec562fd 100644 --- a/examples/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/shadow-map-qml/ShadowMapFrameGraph.qml @@ -41,14 +41,7 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.2 as QQ2 -import QtQml 2.2 FrameGraph { id: root diff --git a/examples/shadow-map-qml/Toyplane.qml b/examples/shadow-map-qml/Toyplane.qml index bb0533126..a35826adf 100644 --- a/examples/shadow-map-qml/Toyplane.qml +++ b/examples/shadow-map-qml/Toyplane.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/shadow-map-qml/Trefoil.qml b/examples/shadow-map-qml/Trefoil.qml index 0f97fb9a2..e4c0cbf1d 100644 --- a/examples/shadow-map-qml/Trefoil.qml +++ b/examples/shadow-map-qml/Trefoil.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/shadow-map-qml/main.qml b/examples/shadow-map-qml/main.qml index fc782dcf2..8c0c24fdb 100644 --- a/examples/shadow-map-qml/main.qml +++ b/examples/shadow-map-qml/main.qml @@ -42,14 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.2 as QQ2 -import QtQml 2.2 - Entity { id: sceneRoot diff --git a/examples/simple-qml/main.qml b/examples/simple-qml/main.qml index 8ed3750e8..1c394815e 100644 --- a/examples/simple-qml/main.qml +++ b/examples/simple-qml/main.qml @@ -41,14 +41,7 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.2 as QQ2 -import QtQml 2.2 Entity { id: sceneRoot diff --git a/examples/tessellation-modes/BasicCamera.qml b/examples/tessellation-modes/BasicCamera.qml index fbd263639..9c9f9583b 100644 --- a/examples/tessellation-modes/BasicCamera.qml +++ b/examples/tessellation-modes/BasicCamera.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Camera { diff --git a/examples/tessellation-modes/TessellatedQuad.qml b/examples/tessellation-modes/TessellatedQuad.qml index 8842a4539..17fa0f3fd 100644 --- a/examples/tessellation-modes/TessellatedQuad.qml +++ b/examples/tessellation-modes/TessellatedQuad.qml @@ -42,12 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 import Qt3D.Examples 1.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/tessellation-modes/TessellatedWireframeEffect.qml b/examples/tessellation-modes/TessellatedWireframeEffect.qml index d8908ee1d..5fd3ded2c 100644 --- a/examples/tessellation-modes/TessellatedWireframeEffect.qml +++ b/examples/tessellation-modes/TessellatedWireframeEffect.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 Effect { diff --git a/examples/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/tessellation-modes/TessellatedWireframeMaterial.qml index 307c8b31b..7173ebd1a 100644 --- a/examples/tessellation-modes/TessellatedWireframeMaterial.qml +++ b/examples/tessellation-modes/TessellatedWireframeMaterial.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Material { diff --git a/examples/tessellation-modes/main.qml b/examples/tessellation-modes/main.qml index 843f31b9b..fd3158d54 100644 --- a/examples/tessellation-modes/main.qml +++ b/examples/tessellation-modes/main.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/torus-qml/main.qml b/examples/torus-qml/main.qml index 12c6e360d..60304880d 100644 --- a/examples/torus-qml/main.qml +++ b/examples/torus-qml/main.qml @@ -42,13 +42,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. -import QtQuick 2.1 as QQ2 - Entity { id: sceneRoot diff --git a/examples/wireframe/BasicCamera.qml b/examples/wireframe/BasicCamera.qml index fbd263639..9c9f9583b 100644 --- a/examples/wireframe/BasicCamera.qml +++ b/examples/wireframe/BasicCamera.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Camera { diff --git a/examples/wireframe/TrefoilKnot.qml b/examples/wireframe/TrefoilKnot.qml index 899ebbb32..c3b6acb70 100644 --- a/examples/wireframe/TrefoilKnot.qml +++ b/examples/wireframe/TrefoilKnot.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { diff --git a/examples/wireframe/WireframeEffect.qml b/examples/wireframe/WireframeEffect.qml index e4b8578dc..a5401439b 100644 --- a/examples/wireframe/WireframeEffect.qml +++ b/examples/wireframe/WireframeEffect.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 Effect { diff --git a/examples/wireframe/WireframeMaterial.qml b/examples/wireframe/WireframeMaterial.qml index cecf8c338..80f65bd6b 100644 --- a/examples/wireframe/WireframeMaterial.qml +++ b/examples/wireframe/WireframeMaterial.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Material { diff --git a/examples/wireframe/main.qml b/examples/wireframe/main.qml index 10546d5b4..ccb34d8b3 100644 --- a/examples/wireframe/main.qml +++ b/examples/wireframe/main.qml @@ -41,12 +41,6 @@ import Qt3D 2.0 import Qt3D.Render 2.0 - -// For Qt.vector3d() and friends. For some reason this is provided by -// QQuickValueTypeProvider in QtQuick rather than the default value -// type provider in QtQml. So we will need to replicate this in Qt3D -// for the types that we wish to support. Otherwise we'll have to import -// QtQuick 2.1 all over the place. import QtQuick 2.1 as QQ2 Entity { |