diff options
120 files changed, 132 insertions, 126 deletions
diff --git a/examples/qt3d/anaglyph-rendering/StereoCamera.qml b/examples/qt3d/anaglyph-rendering/StereoCamera.qml index 3098ba367..aaa8641fc 100644 --- a/examples/qt3d/anaglyph-rendering/StereoCamera.qml +++ b/examples/qt3d/anaglyph-rendering/StereoCamera.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml index b958255ee..455f3bf93 100644 --- a/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml +++ b/examples/qt3d/anaglyph-rendering/StereoFrameGraph.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Viewport { diff --git a/examples/qt3d/anaglyph-rendering/main.qml b/examples/qt3d/anaglyph-rendering/main.qml index aaa253f3c..6bf6fef1a 100644 --- a/examples/qt3d/anaglyph-rendering/main.qml +++ b/examples/qt3d/anaglyph-rendering/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.4 as QQ2 diff --git a/examples/qt3d/assimp/main.qml b/examples/qt3d/assimp/main.qml index e8819a51f..f0965ac04 100644 --- a/examples/qt3d/assimp/main.qml +++ b/examples/qt3d/assimp/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Examples 2.0 import QtQuick 2.0 as Quick diff --git a/examples/qt3d/bigmodel-qml/MyEntity.qml b/examples/qt3d/bigmodel-qml/MyEntity.qml index 8e0e819bc..4cee86603 100644 --- a/examples/qt3d/bigmodel-qml/MyEntity.qml +++ b/examples/qt3d/bigmodel-qml/MyEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/bigmodel-qml/main.qml b/examples/qt3d/bigmodel-qml/main.qml index 2d5cdf536..7eaeff68b 100644 --- a/examples/qt3d/bigmodel-qml/main.qml +++ b/examples/qt3d/bigmodel-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/bigscene-instanced-qml/main.qml b/examples/qt3d/bigscene-instanced-qml/main.qml index 9d5cc596e..bff2d9b24 100644 --- a/examples/qt3d/bigscene-instanced-qml/main.qml +++ b/examples/qt3d/bigscene-instanced-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml index 9becbc217..de92b5274 100644 --- a/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml +++ b/examples/qt3d/clip-planes-qml/CappingMaterialEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml index 2716fa25b..1a8bfa6f2 100644 --- a/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml +++ b/examples/qt3d/clip-planes-qml/ClipCappingFrameGraph.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Viewport { diff --git a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml index c92732625..e31419c53 100644 --- a/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml +++ b/examples/qt3d/clip-planes-qml/ClipMaterialEffect.qml @@ -33,7 +33,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml index 76d721e7c..3f2dba431 100644 --- a/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml +++ b/examples/qt3d/clip-planes-qml/ClipPlaneEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml index 5fac3b709..325056569 100644 --- a/examples/qt3d/clip-planes-qml/ClippingPlanes.qml +++ b/examples/qt3d/clip-planes-qml/ClippingPlanes.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.4 as QQ2 diff --git a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml index 2e7579de6..4c1aff7ea 100644 --- a/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml +++ b/examples/qt3d/clip-planes-qml/PlaneVisualizationMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/examples/qt3d/clip-planes-qml/main.qml b/examples/qt3d/clip-planes-qml/main.qml index 9bb7bd7ad..6ac0e492c 100644 --- a/examples/qt3d/clip-planes-qml/main.qml +++ b/examples/qt3d/clip-planes-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/controls/Logo.qml b/examples/qt3d/controls/Logo.qml index bcd7a4359..a61e85298 100644 --- a/examples/qt3d/controls/Logo.qml +++ b/examples/qt3d/controls/Logo.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 diff --git a/examples/qt3d/custom-mesh-qml/main.qml b/examples/qt3d/custom-mesh-qml/main.qml index 94f79c365..290a08ded 100644 --- a/examples/qt3d/custom-mesh-qml/main.qml +++ b/examples/qt3d/custom-mesh-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/cylinder-qml/main.qml b/examples/qt3d/cylinder-qml/main.qml index 4c5e5e4e7..ebb3bf208 100644 --- a/examples/qt3d/cylinder-qml/main.qml +++ b/examples/qt3d/cylinder-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml index 82401fe66..cc7dd39d7 100644 --- a/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/qt3d/deferred-renderer-qml/DeferredRenderer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Viewport { diff --git a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml index 07dbdffa5..8e9e3363e 100644 --- a/examples/qt3d/deferred-renderer-qml/FinalEffect.qml +++ b/examples/qt3d/deferred-renderer-qml/FinalEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml index 94c889be1..f82cb9fbe 100644 --- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml +++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 RenderTarget { diff --git a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml index 589a4ac37..f23b8cc6b 100644 --- a/examples/qt3d/deferred-renderer-qml/SceneEffect.qml +++ b/examples/qt3d/deferred-renderer-qml/SceneEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/deferred-renderer-qml/main.qml b/examples/qt3d/deferred-renderer-qml/main.qml index 4b9ee9a28..bc5886ac2 100644 --- a/examples/qt3d/deferred-renderer-qml/main.qml +++ b/examples/qt3d/deferred-renderer-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/enabled-qml/main.qml b/examples/qt3d/enabled-qml/main.qml index a7cb5ed45..3367a3748 100644 --- a/examples/qt3d/enabled-qml/main.qml +++ b/examples/qt3d/enabled-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/gltf/Wine.qml b/examples/qt3d/gltf/Wine.qml index 4a61c6584..2a5eb0a93 100644 --- a/examples/qt3d/gltf/Wine.qml +++ b/examples/qt3d/gltf/Wine.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/gltf/main.qml b/examples/qt3d/gltf/main.qml index c58aaf5d4..059141ef9 100644 --- a/examples/qt3d/gltf/main.qml +++ b/examples/qt3d/gltf/main.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/gooch-qml/MyEntity.qml b/examples/qt3d/gooch-qml/MyEntity.qml index 0bd449f1a..875da96f4 100644 --- a/examples/qt3d/gooch-qml/MyEntity.qml +++ b/examples/qt3d/gooch-qml/MyEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/gooch-qml/main.qml b/examples/qt3d/gooch-qml/main.qml index 7fb070153..60b722403 100644 --- a/examples/qt3d/gooch-qml/main.qml +++ b/examples/qt3d/gooch-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/keyboardinput-qml/SphereEntity.qml b/examples/qt3d/keyboardinput-qml/SphereEntity.qml index 55061a44e..7aaade62f 100644 --- a/examples/qt3d/keyboardinput-qml/SphereEntity.qml +++ b/examples/qt3d/keyboardinput-qml/SphereEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 import QtQuick 2.3 as QQ2 diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml index 61a8ed2c3..5b4d56fca 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/examples/qt3d/keyboardinput-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 diff --git a/examples/qt3d/loader-qml/CuboidEntity.qml b/examples/qt3d/loader-qml/CuboidEntity.qml index 5af463870..0ef6890d6 100644 --- a/examples/qt3d/loader-qml/CuboidEntity.qml +++ b/examples/qt3d/loader-qml/CuboidEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.4 as QQ2 diff --git a/examples/qt3d/loader-qml/SphereEntity.qml b/examples/qt3d/loader-qml/SphereEntity.qml index f69ce0613..076d157b8 100644 --- a/examples/qt3d/loader-qml/SphereEntity.qml +++ b/examples/qt3d/loader-qml/SphereEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.4 as QQ2 diff --git a/examples/qt3d/loader-qml/main.qml b/examples/qt3d/loader-qml/main.qml index 569a03979..c0138d268 100644 --- a/examples/qt3d/loader-qml/main.qml +++ b/examples/qt3d/loader-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/materials/Barrel.qml b/examples/qt3d/materials/Barrel.qml index a79cffbc1..55d2ee403 100644 --- a/examples/qt3d/materials/Barrel.qml +++ b/examples/qt3d/materials/Barrel.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/materials/BasicCamera.qml b/examples/qt3d/materials/BasicCamera.qml index e8a8bd7f4..5e251ee4d 100644 --- a/examples/qt3d/materials/BasicCamera.qml +++ b/examples/qt3d/materials/BasicCamera.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Camera { diff --git a/examples/qt3d/materials/Chest.qml b/examples/qt3d/materials/Chest.qml index a8ef6b3f5..a578328f7 100644 --- a/examples/qt3d/materials/Chest.qml +++ b/examples/qt3d/materials/Chest.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/materials/HousePlant.qml b/examples/qt3d/materials/HousePlant.qml index 1f2a759af..3df036675 100644 --- a/examples/qt3d/materials/HousePlant.qml +++ b/examples/qt3d/materials/HousePlant.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/materials/PlaneEntity.qml b/examples/qt3d/materials/PlaneEntity.qml index 6e1f1925e..57a925622 100644 --- a/examples/qt3d/materials/PlaneEntity.qml +++ b/examples/qt3d/materials/PlaneEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/materials/RenderableEntity.qml b/examples/qt3d/materials/RenderableEntity.qml index 60b62a05b..f11d28272 100644 --- a/examples/qt3d/materials/RenderableEntity.qml +++ b/examples/qt3d/materials/RenderableEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/materials/SortedForwardRenderer.qml b/examples/qt3d/materials/SortedForwardRenderer.qml index 13e79800f..a48db2567 100644 --- a/examples/qt3d/materials/SortedForwardRenderer.qml +++ b/examples/qt3d/materials/SortedForwardRenderer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 TechniqueFilter { diff --git a/examples/qt3d/materials/TrefoilKnot.qml b/examples/qt3d/materials/TrefoilKnot.qml index 51b2409b3..b0cd508d4 100644 --- a/examples/qt3d/materials/TrefoilKnot.qml +++ b/examples/qt3d/materials/TrefoilKnot.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/materials/main.qml b/examples/qt3d/materials/main.qml index 2a3190640..3fa870d74 100644 --- a/examples/qt3d/materials/main.qml +++ b/examples/qt3d/materials/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/mouseinput-qml/main.qml b/examples/qt3d/mouseinput-qml/main.qml index 443b9a952..55c51fa9d 100644 --- a/examples/qt3d/mouseinput-qml/main.qml +++ b/examples/qt3d/mouseinput-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 diff --git a/examples/qt3d/multiviewport/main.qml b/examples/qt3d/multiviewport/main.qml index c5606fd25..dc0357e02 100644 --- a/examples/qt3d/multiviewport/main.qml +++ b/examples/qt3d/multiviewport/main.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.0 -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml index ea043d22b..e2afd3f93 100644 --- a/examples/qt3d/planets-qml/CloudEffectDS.qml +++ b/examples/qt3d/planets-qml/CloudEffectDS.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/planets-qml/Light.qml b/examples/qt3d/planets-qml/Light.qml index a90d11ff3..5a4fc4c39 100644 --- a/examples/qt3d/planets-qml/Light.qml +++ b/examples/qt3d/planets-qml/Light.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml index 59c901717..55690d259 100644 --- a/examples/qt3d/planets-qml/PlanetEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetEffectD.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml index c825d4868..22337ba66 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml index 51de33ec4..f70a46f25 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml index a7abcf45f..edb128f1b 100644 --- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml +++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 FrameGraph { diff --git a/examples/qt3d/planets-qml/PlanetMaterial.qml b/examples/qt3d/planets-qml/PlanetMaterial.qml index e754394b0..087fb5d24 100644 --- a/examples/qt3d/planets-qml/PlanetMaterial.qml +++ b/examples/qt3d/planets-qml/PlanetMaterial.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml index e5fcc8ae0..0899e1593 100644 --- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml @@ -35,7 +35,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml index 1e719bc6d..8351845f1 100644 --- a/examples/qt3d/planets-qml/SolarSystem.qml +++ b/examples/qt3d/planets-qml/SolarSystem.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/plasma/main.qml b/examples/qt3d/plasma/main.qml index e0e73be68..69cb16fa5 100644 --- a/examples/qt3d/plasma/main.qml +++ b/examples/qt3d/plasma/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/playground-qml/AdsEffect.qml b/examples/qt3d/playground-qml/AdsEffect.qml index 958d69768..20fa62817 100644 --- a/examples/qt3d/playground-qml/AdsEffect.qml +++ b/examples/qt3d/playground-qml/AdsEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 // For Qt.vector3d() and friends. For some reason this is provided by diff --git a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml index f376baf31..eb4e94d03 100644 --- a/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml +++ b/examples/qt3d/playground-qml/AnimatedDiffuseMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/playground-qml/ComplexTechnique.qml b/examples/qt3d/playground-qml/ComplexTechnique.qml index 8d7395786..fce358f73 100644 --- a/examples/qt3d/playground-qml/ComplexTechnique.qml +++ b/examples/qt3d/playground-qml/ComplexTechnique.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Technique { diff --git a/examples/qt3d/playground-qml/DetailView.qml b/examples/qt3d/playground-qml/DetailView.qml index f0fc20d38..9717c5377 100644 --- a/examples/qt3d/playground-qml/DetailView.qml +++ b/examples/qt3d/playground-qml/DetailView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 diff --git a/examples/qt3d/playground-qml/MainView.qml b/examples/qt3d/playground-qml/MainView.qml index 8e477f698..02f6e2ea9 100644 --- a/examples/qt3d/playground-qml/MainView.qml +++ b/examples/qt3d/playground-qml/MainView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/playground-qml/MyForwardRenderer.qml b/examples/qt3d/playground-qml/MyForwardRenderer.qml index 0c9d08c62..1dc316760 100644 --- a/examples/qt3d/playground-qml/MyForwardRenderer.qml +++ b/examples/qt3d/playground-qml/MyForwardRenderer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 TechniqueFilter { diff --git a/examples/qt3d/playground-qml/RenderableEntity.qml b/examples/qt3d/playground-qml/RenderableEntity.qml index bdb1f22b9..d305d413e 100644 --- a/examples/qt3d/playground-qml/RenderableEntity.qml +++ b/examples/qt3d/playground-qml/RenderableEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/playground-qml/main.qml b/examples/qt3d/playground-qml/main.qml index 09a784955..d4495c24e 100644 --- a/examples/qt3d/playground-qml/main.qml +++ b/examples/qt3d/playground-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/scene3d-loader/AnimatedEntity.qml b/examples/qt3d/scene3d-loader/AnimatedEntity.qml index cf209e39d..b98bbf8ab 100644 --- a/examples/qt3d/scene3d-loader/AnimatedEntity.qml +++ b/examples/qt3d/scene3d-loader/AnimatedEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/scene3d-loader/Scene2.qml b/examples/qt3d/scene3d-loader/Scene2.qml index e8e452cce..a3afae363 100644 --- a/examples/qt3d/scene3d-loader/Scene2.qml +++ b/examples/qt3d/scene3d-loader/Scene2.qml @@ -36,7 +36,7 @@ import QtQuick 2.0 import QtQuick.Scene3D 2.0 -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Scene3D { diff --git a/examples/qt3d/scene3d/AnimatedEntity.qml b/examples/qt3d/scene3d/AnimatedEntity.qml index 6007d609e..d958d8d88 100644 --- a/examples/qt3d/scene3d/AnimatedEntity.qml +++ b/examples/qt3d/scene3d/AnimatedEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml index a54f32d13..beda086f7 100644 --- a/examples/qt3d/shadow-map-qml/AdsEffect.qml +++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/shadow-map-qml/AdsMaterial.qml b/examples/qt3d/shadow-map-qml/AdsMaterial.qml index 93708cbe9..4756f0960 100644 --- a/examples/qt3d/shadow-map-qml/AdsMaterial.qml +++ b/examples/qt3d/shadow-map-qml/AdsMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 diff --git a/examples/qt3d/shadow-map-qml/GroundPlane.qml b/examples/qt3d/shadow-map-qml/GroundPlane.qml index e126547b5..72b34a760 100644 --- a/examples/qt3d/shadow-map-qml/GroundPlane.qml +++ b/examples/qt3d/shadow-map-qml/GroundPlane.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/shadow-map-qml/Light.qml b/examples/qt3d/shadow-map-qml/Light.qml index e4a87830a..1490330b2 100644 --- a/examples/qt3d/shadow-map-qml/Light.qml +++ b/examples/qt3d/shadow-map-qml/Light.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml index 84dcd1f24..5d549bf67 100644 --- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/Toyplane.qml b/examples/qt3d/shadow-map-qml/Toyplane.qml index 3ac2b64ce..fd2a92fcb 100644 --- a/examples/qt3d/shadow-map-qml/Toyplane.qml +++ b/examples/qt3d/shadow-map-qml/Toyplane.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/Trefoil.qml b/examples/qt3d/shadow-map-qml/Trefoil.qml index 9eefd425e..865632f57 100644 --- a/examples/qt3d/shadow-map-qml/Trefoil.qml +++ b/examples/qt3d/shadow-map-qml/Trefoil.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/shadow-map-qml/main.qml b/examples/qt3d/shadow-map-qml/main.qml index 8bc021760..ba2e17255 100644 --- a/examples/qt3d/shadow-map-qml/main.qml +++ b/examples/qt3d/shadow-map-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/simple-qml/main.qml b/examples/qt3d/simple-qml/main.qml index 9d9038d7d..11dd5b6f3 100644 --- a/examples/qt3d/simple-qml/main.qml +++ b/examples/qt3d/simple-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/examples/qt3d/simple-shaders-qml/main.qml index 7dc5a0f53..4d8a9d294 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/examples/qt3d/simple-shaders-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/skybox/Skybox.qml b/examples/qt3d/skybox/Skybox.qml index f396484bc..7416d8206 100644 --- a/examples/qt3d/skybox/Skybox.qml +++ b/examples/qt3d/skybox/Skybox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/skybox/main.qml b/examples/qt3d/skybox/main.qml index e84d027d6..ed5adc2cd 100644 --- a/examples/qt3d/skybox/main.qml +++ b/examples/qt3d/skybox/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/tessellation-modes/BasicCamera.qml b/examples/qt3d/tessellation-modes/BasicCamera.qml index 385b40397..7460ecb70 100644 --- a/examples/qt3d/tessellation-modes/BasicCamera.qml +++ b/examples/qt3d/tessellation-modes/BasicCamera.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/tessellation-modes/TessellatedQuad.qml b/examples/qt3d/tessellation-modes/TessellatedQuad.qml index 39199af10..264ab6abb 100644 --- a/examples/qt3d/tessellation-modes/TessellatedQuad.qml +++ b/examples/qt3d/tessellation-modes/TessellatedQuad.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Examples 1.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml index 57d9a0b4d..9f6e4eb6b 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml index c812e2295..a7624f8a6 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml index 864081cb5..e52623d31 100644 --- a/examples/qt3d/tessellation-modes/main.qml +++ b/examples/qt3d/tessellation-modes/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/torus-qml/main.qml b/examples/qt3d/torus-qml/main.qml index 47ad51c83..a980d1094 100644 --- a/examples/qt3d/torus-qml/main.qml +++ b/examples/qt3d/torus-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/transparency-qml-scene3d/Scene.qml b/examples/qt3d/transparency-qml-scene3d/Scene.qml index d17f9e4b0..923f5b049 100644 --- a/examples/qt3d/transparency-qml-scene3d/Scene.qml +++ b/examples/qt3d/transparency-qml-scene3d/Scene.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 diff --git a/examples/qt3d/transparency-qml/main.qml b/examples/qt3d/transparency-qml/main.qml index a86cd955e..f0db963c7 100644 --- a/examples/qt3d/transparency-qml/main.qml +++ b/examples/qt3d/transparency-qml/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.4 as QQ2 diff --git a/examples/qt3d/wave/Background.qml b/examples/qt3d/wave/Background.qml index b9005c2b4..7dc69003d 100644 --- a/examples/qt3d/wave/Background.qml +++ b/examples/qt3d/wave/Background.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/examples/qt3d/wave/BackgroundEffect.qml b/examples/qt3d/wave/BackgroundEffect.qml index ad2170d47..1859c2ee0 100644 --- a/examples/qt3d/wave/BackgroundEffect.qml +++ b/examples/qt3d/wave/BackgroundEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/wave/BasicCamera.qml b/examples/qt3d/wave/BasicCamera.qml index df21bcd5d..b2dbd10b8 100644 --- a/examples/qt3d/wave/BasicCamera.qml +++ b/examples/qt3d/wave/BasicCamera.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Camera { diff --git a/examples/qt3d/wave/Wave.qml b/examples/qt3d/wave/Wave.qml index 72badde5f..af7e57e4c 100644 --- a/examples/qt3d/wave/Wave.qml +++ b/examples/qt3d/wave/Wave.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/wave/WaveEffect.qml b/examples/qt3d/wave/WaveEffect.qml index 4391d71c2..0675e542c 100644 --- a/examples/qt3d/wave/WaveEffect.qml +++ b/examples/qt3d/wave/WaveEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/wave/WaveForwardRenderer.qml b/examples/qt3d/wave/WaveForwardRenderer.qml index 49e6be22b..d55232de3 100644 --- a/examples/qt3d/wave/WaveForwardRenderer.qml +++ b/examples/qt3d/wave/WaveForwardRenderer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 TechniqueFilter { diff --git a/examples/qt3d/wave/WaveMaterial.qml b/examples/qt3d/wave/WaveMaterial.qml index c1dda4695..5eab12bf5 100644 --- a/examples/qt3d/wave/WaveMaterial.qml +++ b/examples/qt3d/wave/WaveMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml index 0836cecd1..23e92beae 100644 --- a/examples/qt3d/wave/main.qml +++ b/examples/qt3d/wave/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import Qt3D.Input 2.0 diff --git a/examples/qt3d/wireframe/BasicCamera.qml b/examples/qt3d/wireframe/BasicCamera.qml index df21bcd5d..b2dbd10b8 100644 --- a/examples/qt3d/wireframe/BasicCamera.qml +++ b/examples/qt3d/wireframe/BasicCamera.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Camera { diff --git a/examples/qt3d/wireframe/TrefoilKnot.qml b/examples/qt3d/wireframe/TrefoilKnot.qml index 47a3b49ba..e1a340947 100644 --- a/examples/qt3d/wireframe/TrefoilKnot.qml +++ b/examples/qt3d/wireframe/TrefoilKnot.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/examples/qt3d/wireframe/WireframeEffect.qml b/examples/qt3d/wireframe/WireframeEffect.qml index f413b2992..2f98a529f 100644 --- a/examples/qt3d/wireframe/WireframeEffect.qml +++ b/examples/qt3d/wireframe/WireframeEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Effect { diff --git a/examples/qt3d/wireframe/WireframeMaterial.qml b/examples/qt3d/wireframe/WireframeMaterial.qml index b8a08b29e..c20f75446 100644 --- a/examples/qt3d/wireframe/WireframeMaterial.qml +++ b/examples/qt3d/wireframe/WireframeMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/examples/qt3d/wireframe/main.qml b/examples/qt3d/wireframe/main.qml index ab739b187..4f40292bc 100644 --- a/examples/qt3d/wireframe/main.qml +++ b/examples/qt3d/wireframe/main.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 import QtQuick 2.1 as QQ2 diff --git a/src/quick3d/imports/core/importscore.pro b/src/quick3d/imports/core/importscore.pro index 7cfc2534a..af606a5a3 100644 --- a/src/quick3d/imports/core/importscore.pro +++ b/src/quick3d/imports/core/importscore.pro @@ -1,6 +1,6 @@ CXX_MODULE = qml TARGET = quick3dcoreplugin -TARGETPATH = Qt3D +TARGETPATH = Qt3D/Core QT += qml 3dcore 3dcore-private 3dquick 3dquick-private diff --git a/src/quick3d/imports/core/qmldir b/src/quick3d/imports/core/qmldir index 0e3b76f75..6c58c072e 100644 --- a/src/quick3d/imports/core/qmldir +++ b/src/quick3d/imports/core/qmldir @@ -1,3 +1,3 @@ -module Qt3D +module Qt3D.Core plugin quick3dcoreplugin classname Qt3DQuick3DCorePlugin diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp index 8e654f395..547b7e838 100644 --- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp +++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp @@ -60,14 +60,14 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri) qmlRegisterUncreatableType<Qt3DCore::QAbstractTransform>(uri, 2, 0, "QAbstractTransform", QStringLiteral("QAbstractTransform is abstract")); qmlRegisterType<Qt3DCore::Quick::Quick3DConfiguration>(uri, 2, 0, "Configuration"); - Qt3DCore::Quick::registerExtendedType<Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity>("QEntity", "Qt3D/Entity", uri, 2, 0, "Entity"); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QEntity, Qt3DCore::Quick::Quick3DEntity>("QEntity", "Qt3D.Core/Entity", uri, 2, 0, "Entity"); qmlRegisterType<Qt3DCore::Quick::Quick3DEntityLoader>(uri, 2, 0, "EntityLoader"); qmlRegisterType<Qt3DCore::Quick::Quick3DNodeInstantiator>(uri, 2, 0, "NodeInstantiator"); - Qt3DCore::Quick::registerExtendedType<Qt3DCore::QTransform, Qt3DCore::Quick::Quick3DTransform>("QTransform", "Qt3D/Transform", uri, 2, 0, "Transform"); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QTransform, Qt3DCore::Quick::Quick3DTransform>("QTransform", "Qt3D.Core/Transform", uri, 2, 0, "Transform"); // Ideally we want to make Node an uncreatable type // We would need qmlRegisterUncreatableExtendedType for that qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class")); - Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D/Camera", uri, 2, 0, "Camera"); + Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D.Core/Camera", uri, 2, 0, "Camera"); qmlRegisterType<Qt3DCore::QCameraLens>(uri, 2, 0, "CameraLens"); qmlRegisterType<Qt3DCore::QMatrixTransform>(uri, 2, 0, "MatrixTransform"); diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml index 3697b0b3d..d6d543ba2 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml index cb52a67cf..9be6951d6 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml index 861854169..6c2b4f923 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 TechniqueFilter { diff --git a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml index dac326514..7128701e7 100644 --- a/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/GoochMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index ff070197a..9981f4b30 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml index 862ef5afa..f30f46452 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml index 44de8940b..bc60ade6a 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml index 2199a2cc6..d891b5671 100644 --- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml index b985c213b..d930561e7 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml index de71040b8..a7d5c85fe 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml index fd810bc9e..1c6571b09 100644 --- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml +++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Entity { diff --git a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml index fbe9afb29..ce04f60ee 100644 --- a/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/TextureMaterial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D 2.0 +import Qt3D.Core 2.0 import Qt3D.Renderer 2.0 Material { diff --git a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp index 2c19c67cc..a17efd3f1 100644 --- a/src/quick3d/quick3d/qt3dquickvaluetypes.cpp +++ b/src/quick3d/quick3d/qt3dquickvaluetypes.cpp @@ -45,7 +45,7 @@ namespace Quick { namespace Quick3DValueTypes { void registerValueTypes() { - QQmlValueTypeFactory::registerValueTypes("Qt3D", 2, 0); + QQmlValueTypeFactory::registerValueTypes("Qt3D.Core", 2, 0); } } diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml index 23084bfb0..4db3e0f10 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml @@ -1,13 +1,11 @@ import QtQml 2.1 -// To avoid clash with Component.onCompleted -// TODO: Export Qt3D::QComponent with a different name -import Qt3D 2.0 as Qt3D +import Qt3D.Core 2.0 -Qt3D.Entity { - Qt3D.NodeInstantiator { +Entity { + NodeInstantiator { objectName: "instantiator1" model: model1 - delegate: Qt3D.Entity { + delegate: Entity { property string datum: model.text } } diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml index ad4879c7a..67c1e4fe7 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { model: 10 diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml index c2ea5b650..736a02b45 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { model: 0 diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml index 2816310ec..630da9940 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { Entity { diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml index 1edef1e0c..178229059 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { active: false diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml index 55f536b1f..431c1ebd8 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { model: ["alpha", "beta", "gamma", "delta"] diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro b/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro index f690d2c3b..15435d13e 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro +++ b/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro @@ -7,6 +7,14 @@ SOURCES += \ tst_quick3dnodeinstantiator.cpp HEADERS += stringmodel.h +OTHER_FILES = \ + data/createAndRemove.qml \ + data/createMultiple.qml \ + data/createNone.qml \ + data/createSingle.qml \ + data/inactive.qml \ + data/stringModel.qml + include (../../shared/util.pri) TESTDATA = data/* |