diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:59:24 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:59:24 +0200 |
| commit | d691f5ca2b6749006673e199b1d668a6daa9b990 (patch) | |
| tree | eacad24192e1e0c492320e14bdfd7c3c203a01e0 /examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml | |
| parent | d415d3256d055ef6fd7dad5c0497ecfaa56ee64d (diff) | |
| parent | 150ff6662de1312e3ba9d000895d80dd5805ea5b (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Iecd8d7b94e52a8981526b12cffa40e99870ba62f
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml')
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml index 002a74a46..7a0f21984 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml @@ -44,7 +44,7 @@ import QtQuick 2.0 Effect { parameters: ListModel { ListElement { - name: "granularity" + name: "Granularity" value: 0.5 } } |