diff options
author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-07 13:30:29 +0100 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-07 17:19:09 +0100 |
commit | 31d57b6d9d39d7fdc03526c9703d0b4010d512c5 (patch) | |
tree | 9471839273c0505026c9564c57070c609dbd20b7 /examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml | |
parent | 58cbea0f93af1e613eeeffec68d00c4df0ae4bf9 (diff) | |
parent | c3f5a15f24f4421e0a096b2272273d9a85f70851 (diff) | |
download | qtmultimedia-31d57b6d9d39d7fdc03526c9703d0b4010d512c5.tar.gz |
Merge remote-tracking branch 'origin/dev' into wip/gstreamer-1.0
Conflicts:
qtmultimedia.pro
src/gsttools/qvideosurfacegstsink.cpp
src/plugins/gstreamer/camerabin/camerabinsession.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
Change-Id: Ib533c187c010f97f96e44eb765281afd55763a8f
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml')
-rw-r--r-- | examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml index 0a2a1584f..19785ce86 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml @@ -84,7 +84,6 @@ Rectangle { } onEffectSourceChanged: { - console.log("[qmlvideofx] Content.onEffectSourceChanged " + effectSource) effectLoader.source = effectSource effectLoader.item.parent = root effectLoader.item.targetWidth = root.width @@ -96,7 +95,6 @@ Rectangle { } function init() { - console.log("[qmlvideofx] Content.init") openImage("qrc:/images/qt-logo.png") root.effectSource = "EffectPassThrough.qml" } @@ -107,7 +105,6 @@ Rectangle { } function updateSource() { - console.log("[qmlvideofx] Content.updateSource") if (contentLoader.item) { contentLoader.item.parent = root contentLoader.item.anchors.fill = root @@ -118,7 +115,6 @@ Rectangle { } function openImage(path) { - console.log("[qmlvideofx] Content.openImage \"" + path + "\"") stop() contentLoader.source = "ContentImage.qml" videoFramePaintedConnection.target = null @@ -127,7 +123,6 @@ Rectangle { } function openVideo(path) { - console.log("[qmlvideofx] Content.openVideo \"" + path + "\"") stop() contentLoader.source = "ContentVideo.qml" videoFramePaintedConnection.target = contentLoader.item @@ -138,7 +133,6 @@ Rectangle { } function openCamera() { - console.log("[qmlvideofx] Content.openCamera") stop() contentLoader.source = "ContentCamera.qml" videoFramePaintedConnection.target = contentLoader.item @@ -146,7 +140,6 @@ Rectangle { } function stop() { - console.log("[qmlvideofx] Content.stop") if (contentLoader.source == "ContentVideo.qml") contentLoader.item.stop() theSource.sourceItem = null |