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 /examples/qt3d/planets-qml | |
| 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 'examples/qt3d/planets-qml')
| -rw-r--r-- | examples/qt3d/planets-qml/CloudEffectDS.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/Light.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/Planet.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetEffectD.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetEffectDB.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetEffectDS.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetEffectDSB.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetMaterial.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/Ring.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/ShadowMapFrameGraph.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/SolarSystem.qml | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml index 3088f996a..f3c88f058 100644 --- a/examples/qt3d/planets-qml/CloudEffectDS.qml +++ b/examples/qt3d/planets-qml/CloudEffectDS.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/Light.qml b/examples/qt3d/planets-qml/Light.qml index ab63bf1e0..199d3f30a 100644 --- a/examples/qt3d/planets-qml/Light.qml +++ b/examples/qt3d/planets-qml/Light.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Entity { id: root diff --git a/examples/qt3d/planets-qml/Planet.qml b/examples/qt3d/planets-qml/Planet.qml index 005312b5d..4381ebdb1 100644 --- a/examples/qt3d/planets-qml/Planet.qml +++ b/examples/qt3d/planets-qml/Planet.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 SphereMesh { property real r: 0 diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml index 5d3f64f89..34dab4498 100644 --- a/examples/qt3d/planets-qml/PlanetEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetEffectD.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml index a36cdf427..dc261582d 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetEffectDS.qml b/examples/qt3d/planets-qml/PlanetEffectDS.qml index 670fccc15..f1b2a2e2d 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDS.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDS.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml index 1b035406a..58a1d1d80 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 Effect { id: root diff --git a/examples/qt3d/planets-qml/PlanetMaterial.qml b/examples/qt3d/planets-qml/PlanetMaterial.qml index 5fd259e45..25f7da09d 100644 --- a/examples/qt3d/planets-qml/PlanetMaterial.qml +++ b/examples/qt3d/planets-qml/PlanetMaterial.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.1 Material { diff --git a/examples/qt3d/planets-qml/Ring.qml b/examples/qt3d/planets-qml/Ring.qml index 7bf585805..1dcb59618 100644 --- a/examples/qt3d/planets-qml/Ring.qml +++ b/examples/qt3d/planets-qml/Ring.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 // TODO: Once support for meshes from arrays is implemented, replace ring.obj with that Mesh { diff --git a/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml b/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml index 8b52e42d4..5020d13c0 100644 --- a/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml +++ b/examples/qt3d/planets-qml/ShadowMapFrameGraph.qml @@ -36,7 +36,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.2 as QQ2 FrameGraph { diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml index d34627735..328f41c1b 100644 --- a/examples/qt3d/planets-qml/SolarSystem.qml +++ b/examples/qt3d/planets-qml/SolarSystem.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import Qt3D 2.0 -import Qt3D.Render 2.0 +import Qt3D.Renderer 2.0 import QtQuick 2.0 as QQ2 import "planets.js" as Planets |