diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-20 11:05:04 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-01-20 11:57:56 +0100 |
| commit | 639b279d7d106ed06ca9a6418e2a9d54b7550639 (patch) | |
| tree | ed6c717217368ee4d7a93f9335da059a0adf49b8 /examples | |
| parent | 9a9f43ad591f700ac3cf5bd443b43273b4c1c426 (diff) | |
Fix for wave example
There was a conflict between ForwardRenderer which is a default FrameGrapg and
the FrameGraph in ForwardRenderer.qml
Change-Id: I4b7dd9664b100858ce3b5f10d9d02eca6a8f5f52
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/wave/WaveForwardRenderer.qml (renamed from examples/wave/ForwardRenderer.qml) | 0 | ||||
| -rw-r--r-- | examples/wave/main.qml | 2 | ||||
| -rw-r--r-- | examples/wave/wave.pro | 2 | ||||
| -rw-r--r-- | examples/wave/wave.qrc | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/examples/wave/ForwardRenderer.qml b/examples/wave/WaveForwardRenderer.qml index f3b9ff6a2..f3b9ff6a2 100644 --- a/examples/wave/ForwardRenderer.qml +++ b/examples/wave/WaveForwardRenderer.qml diff --git a/examples/wave/main.qml b/examples/wave/main.qml index 0f23f34dd..6a1f38ca0 100644 --- a/examples/wave/main.qml +++ b/examples/wave/main.qml @@ -64,7 +64,7 @@ Entity { FrameGraph { id: frameGraph - activeFrameGraph: ForwardRenderer { + activeFrameGraph: WaveForwardRenderer { camera: mainCamera } } diff --git a/examples/wave/wave.pro b/examples/wave/wave.pro index 4c4380c8d..05c937cb6 100644 --- a/examples/wave/wave.pro +++ b/examples/wave/wave.pro @@ -13,7 +13,7 @@ OTHER_FILES += \ shaders/* \ main.qml \ BasicCamera.qml \ - ForwardRenderer.qml \ + WaveForwardRenderer.qml \ Wave.qml \ WaveEffect.qml \ WaveMaterial.qml \ diff --git a/examples/wave/wave.qrc b/examples/wave/wave.qrc index d9728e715..2ce77a45f 100644 --- a/examples/wave/wave.qrc +++ b/examples/wave/wave.qrc @@ -1,7 +1,6 @@ <RCC> <qresource prefix="/"> <file>main.qml</file> - <file>ForwardRenderer.qml</file> <file>BasicCamera.qml</file> <file>WaveEffect.qml</file> <file>WaveMaterial.qml</file> @@ -14,5 +13,6 @@ <file>shaders/ribbon.vert</file> <file>shaders/ribbonwireframe.frag</file> <file>shaders/robustwireframe.geom</file> + <file>WaveForwardRenderer.qml</file> </qresource> </RCC> |