diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:25:20 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-01 12:52:51 +0200 |
| commit | 659f238bbbe040cce1bdf900f8f5500845ca8727 (patch) | |
| tree | 7990072bf39b2c19df68bcd7615242d08eb8dd2f /examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml | |
| parent | 80ba1d635dc37963b4c90d776c46774b0349c4f8 (diff) | |
| parent | 1dba07b602ef8b3fd9333a8afb1db4cbaf9d824e (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4
Conflicts:
src/gsttools/qgstreamervideoinputdevicecontrol.cpp
src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp
Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
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" } |