Change import name of Qt3D Core from Qt3D 2.0 to Qt3D.Core 2.0

Makes the QML imports consistent with the C++ namespaces.

Change-Id: I8c781a67a9010124bd22bb1fab16c4f1082fd962
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

16 files changed, 18 insertions, 18 deletions

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);
     }
 }