diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:36:25 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 09:37:19 +0100 |
| commit | 2a7b4962a141939eb6efb63fc5834cb7a00141a6 (patch) | |
| tree | f57ae992c4044a3a3667be9d1bb39c084af088d3 /examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml | |
| parent | 9a1e3164f977acc2aa1b8ae182c2000d2ecbe7fc (diff) | |
| parent | 2d54a14ac130812965d89237c8ede479cc2e2df6 (diff) | |
Merge branch 'stable' into release
Change-Id: Ifa5ddfd7ee4a637f78947fc1cb945d3008506973
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml')
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml index 0b7c48cbc..0ec0d13a3 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml @@ -60,5 +60,5 @@ Effect { property real time: 0 NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 } - fragmentShaderFilename: "shaders/ripple.fsh" + fragmentShaderFilename: "ripple.fsh" } |