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/shadow-map-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/shadow-map-qml')
| -rw-r--r-- | examples/qt3d/shadow-map-qml/AdsEffect.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/shadow-map-qml/ShadowMapLight.qml (renamed from examples/qt3d/shadow-map-qml/Light.qml) | 0 | ||||
| -rw-r--r-- | examples/qt3d/shadow-map-qml/main.qml | 2 | ||||
| -rw-r--r-- | examples/qt3d/shadow-map-qml/shadow-map-qml.pro | 2 | ||||
| -rw-r--r-- | examples/qt3d/shadow-map-qml/shadow-map-qml.qrc | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/shadow-map-qml/AdsEffect.qml b/examples/qt3d/shadow-map-qml/AdsEffect.qml index a965c94af..4d3924215 100644 --- a/examples/qt3d/shadow-map-qml/AdsEffect.qml +++ b/examples/qt3d/shadow-map-qml/AdsEffect.qml @@ -41,7 +41,7 @@ Effect { id: root property Texture2D shadowTexture - property Light light + property ShadowMapLight light // These parameters act as default values for the effect. They take // priority over any parameters specified in the RenderPasses below diff --git a/examples/qt3d/shadow-map-qml/Light.qml b/examples/qt3d/shadow-map-qml/ShadowMapLight.qml index a0e0306b0..a0e0306b0 100644 --- a/examples/qt3d/shadow-map-qml/Light.qml +++ b/examples/qt3d/shadow-map-qml/ShadowMapLight.qml diff --git a/examples/qt3d/shadow-map-qml/main.qml b/examples/qt3d/shadow-map-qml/main.qml index f05bbbc8a..37340053a 100644 --- a/examples/qt3d/shadow-map-qml/main.qml +++ b/examples/qt3d/shadow-map-qml/main.qml @@ -57,7 +57,7 @@ Entity { controlledCamera: camera } - Light { + ShadowMapLight { id: light } diff --git a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro index 2988f563d..b8f50aed0 100644 --- a/examples/qt3d/shadow-map-qml/shadow-map-qml.pro +++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.pro @@ -11,7 +11,7 @@ OTHER_FILES += \ main.qml \ AdsMaterial.qml \ AdsEffect.qml \ - Light.qml \ + ShadowMapLight.qml \ ShadowMapFrameGraph.qml \ Trefoil.qml \ Toyplane.qml \ diff --git a/examples/qt3d/shadow-map-qml/shadow-map-qml.qrc b/examples/qt3d/shadow-map-qml/shadow-map-qml.qrc index 9aa6e2c73..f51a418cd 100644 --- a/examples/qt3d/shadow-map-qml/shadow-map-qml.qrc +++ b/examples/qt3d/shadow-map-qml/shadow-map-qml.qrc @@ -3,7 +3,7 @@ <file>main.qml</file> <file>AdsMaterial.qml</file> <file>AdsEffect.qml</file> - <file>Light.qml</file> + <file>ShadowMapLight.qml</file> <file>ShadowMapFrameGraph.qml</file> <file>Trefoil.qml</file> |