diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2014-09-01 14:19:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-09-01 14:19:53 +0200 |
| commit | bc1fa076c944c6af3250cb7210190da42a4de6ea (patch) | |
| tree | b6948fa95abbdd4ffbb30b76c7d3c09ae07e51db /examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml | |
| parent | 0c3438c9a12fbc607eada8f938cf0ad8fdea374d (diff) | |
| parent | 659f238bbbe040cce1bdf900f8f5500845ca8727 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4v5.4.0-alpha1
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml')
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml index ce1987320..58530eb4f 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml @@ -43,7 +43,7 @@ ListModel { ListElement { name: "Emboss"; source: "EffectEmboss.qml" } ListElement { name: "Glow"; source: "EffectGlow.qml" } ListElement { name: "Isolate"; source: "EffectIsolate.qml" } - //ListElement { name: "Magnify"; source: "EffectMagnify.qml" } + ListElement { name: "Magnify"; source: "EffectMagnify.qml" } ListElement { name: "Page curl"; source: "EffectPageCurl.qml" } ListElement { name: "Pixelate"; source: "EffectPixelate.qml" } ListElement { name: "Posterize"; source: "EffectPosterize.qml" } |