diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-06-21 14:57:33 +0100 |
| commit | 099f466847039954c581030c2a5aa2bfce08e0eb (patch) | |
| tree | 194a94d15a68b0c38d2d45c12275afb2c91b9831 /src/quick3d/imports/render/defaults | |
| parent | 7bbd402770fa27f944840c95b6a3c6121883bc58 (diff) | |
| parent | b71f09d143002f15abfd4a407651544942a75c44 (diff) | |
Merge branch '5.5.0' into 5.5
Conflicts:
src/input/qkeyboardcontroller.cpp
Change-Id: Ifb0b5af165fb11dbe07849f34d3b93d9cc78eeaa
Diffstat (limited to 'src/quick3d/imports/render/defaults')
10 files changed, 10 insertions, 10 deletions
diff --git a/src/quick3d/imports/render/defaults/defaults.pri b/src/quick3d/imports/render/defaults/defaults.pri index 4e871abc3..2d219b646 100644 --- a/src/quick3d/imports/render/defaults/defaults.pri +++ b/src/quick3d/imports/render/defaults/defaults.pri @@ -3,7 +3,7 @@ # resource file. # # To have the plugin register them as types, add an entries to the -# qmldir array in qt3dquick3drenderplugin.cpp +# qmldir array in qt3dquick3drendererplugin.cpp QML_FILES = \ $$PWD/qml/PhongMaterial.qml \ $$PWD/qml/DiffuseMapMaterial.qml \ diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml index 5c6838dbd..3697b0b3d 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml index 43885be14..cb52a67cf 100644 --- a/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/DiffuseSpecularMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml index ee7744806..861854169 100644 --- a/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml +++ b/src/quick3d/imports/render/defaults/qml/ForwardRenderer.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 TechniqueFilter { // Expose camera to allow user to choose which camera to use for rendering diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml index df62ec84d..ff070197a 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapAlphaMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml index 16e2f0b42..862ef5afa 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml index bfb2cb163..44de8940b 100644 --- a/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/NormalDiffuseSpecularMapMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id: root diff --git a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml index 6051ca3b9..2199a2cc6 100644 --- a/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PerVertexColorMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml index 4f7a3bd6c..de71040b8 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongMaterial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Material { id:root diff --git a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml index 2f0c54600..fd810bc9e 100644 --- a/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml +++ b/src/quick3d/imports/render/defaults/qml/SkyboxEntity.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { |