diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-30 18:58:33 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-11-30 20:47:32 +0000 |
| commit | c80eed85ee8250f1dbbf1565f2f8ff01b6fa6d0b (patch) | |
| tree | f09e0a9b484186a79e6182d72423ad82c053112b /examples/qt3d/planets-qml | |
| parent | f4542b1f21ed74f76e3cc9914327f0afb3fed4fa (diff) | |
Avoid using the name Light in the examples
To prevent colliding with the standard Qt 3D type.
Change-Id: Ibf7b8b744dd23f1ced231e90486729be894a1be7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/planets-qml')
| -rw-r--r-- | examples/qt3d/planets-qml/CloudEffectDS.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/PlanetEffectDSB.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetShadowEffectD.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/PlanetsLight.qml (renamed from examples/qt3d/planets-qml/Light.qml) | 0 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/SolarSystem.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/planets-qml/planets-qml.qrc | 2 |
8 files changed, 7 insertions, 7 deletions
diff --git a/examples/qt3d/planets-qml/CloudEffectDS.qml b/examples/qt3d/planets-qml/CloudEffectDS.qml index 836349c9b..a949e25c6 100644 --- a/examples/qt3d/planets-qml/CloudEffectDS.qml +++ b/examples/qt3d/planets-qml/CloudEffectDS.qml @@ -42,7 +42,7 @@ Effect { id: root property Texture2D shadowTexture - property Light light + property PlanetsLight light parameters: [ Parameter { name: "lightPosition"; value: root.light.lightPosition }, diff --git a/examples/qt3d/planets-qml/PlanetEffectD.qml b/examples/qt3d/planets-qml/PlanetEffectD.qml index f054db69e..1287967e4 100644 --- a/examples/qt3d/planets-qml/PlanetEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetEffectD.qml @@ -42,7 +42,7 @@ Effect { id: root property Texture2D shadowTexture - property Light light + property PlanetsLight light parameters: [ Parameter { name: "lightViewProjection"; value: root.light.lightViewProjection }, diff --git a/examples/qt3d/planets-qml/PlanetEffectDB.qml b/examples/qt3d/planets-qml/PlanetEffectDB.qml index 210a3390d..b05e8ceaa 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDB.qml @@ -42,7 +42,7 @@ Effect { id: root property Texture2D shadowTexture - property Light light + property PlanetsLight light parameters: [ Parameter { name: "lightViewProjection"; value: root.light.lightViewProjection }, diff --git a/examples/qt3d/planets-qml/PlanetEffectDSB.qml b/examples/qt3d/planets-qml/PlanetEffectDSB.qml index 3e9e231bb..82e93edac 100644 --- a/examples/qt3d/planets-qml/PlanetEffectDSB.qml +++ b/examples/qt3d/planets-qml/PlanetEffectDSB.qml @@ -42,7 +42,7 @@ Effect { id: root property Texture2D shadowTexture - property Light light + property PlanetsLight light parameters: [ Parameter { name: "lightViewProjection"; value: root.light.lightViewProjection }, diff --git a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml index ea589f491..1bbdf7548 100644 --- a/examples/qt3d/planets-qml/PlanetShadowEffectD.qml +++ b/examples/qt3d/planets-qml/PlanetShadowEffectD.qml @@ -42,7 +42,7 @@ Effect { id: root property Texture2D shadowTexture - property Light light + property PlanetsLight light parameters: [ Parameter { name: "lightViewProjection"; value: root.light.lightViewProjection }, diff --git a/examples/qt3d/planets-qml/Light.qml b/examples/qt3d/planets-qml/PlanetsLight.qml index d904d2cff..d904d2cff 100644 --- a/examples/qt3d/planets-qml/Light.qml +++ b/examples/qt3d/planets-qml/PlanetsLight.qml diff --git a/examples/qt3d/planets-qml/SolarSystem.qml b/examples/qt3d/planets-qml/SolarSystem.qml index 8512b019e..eb8611aa5 100644 --- a/examples/qt3d/planets-qml/SolarSystem.qml +++ b/examples/qt3d/planets-qml/SolarSystem.qml @@ -107,7 +107,7 @@ Entity { } } - Light { + PlanetsLight { id: light ratio: width / height } diff --git a/examples/qt3d/planets-qml/planets-qml.qrc b/examples/qt3d/planets-qml/planets-qml.qrc index cf9aafc29..dceaffeeb 100644 --- a/examples/qt3d/planets-qml/planets-qml.qrc +++ b/examples/qt3d/planets-qml/planets-qml.qrc @@ -8,7 +8,7 @@ <file>FpsDisplay.qml</file> <file>Planet.qml</file> <file>Ring.qml</file> - <file>Light.qml</file> + <file>PlanetsLight.qml</file> <file>CloudEffectDS.qml</file> <file>PlanetEffectD.qml</file> <file>PlanetEffectDB.qml</file> |