Restore ContentCamera.qml

The file was removed in 5c3a5cf8106e1b873924b296c792448c33ee4df1 but
left the description, documentation and parts of the functionality
unchanged. This change adds the camera functionality back into the
example.

Change-Id: I3bfdd95f8322796d446c571a4e074ce98e5443dd
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>

diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
new file mode 100644 (file)
index 0000000..ef5a3d4
--- /dev/null
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
@@ -0,0 +1,43 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.1
+import QtMultimedia 5.0
+
+VideoOutput {
+    source: camera
+
+    Camera {
+        id: camera
+    }
+}

diff --git a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
index e7978e3..f3ad277 100644 (file)
--- a/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
+++ b/examples/multimedia/video/qmlvideofx/qmlvideofx.qrc
@@ -3,6 +3,7 @@
         <file>images/qt-logo.png</file>
         <file>qml/qmlvideofx/Button.qml</file>
         <file>qml/qmlvideofx/Content.qml</file>
+        <file>qml/qmlvideofx/ContentCamera.qml</file>
         <file>qml/qmlvideofx/ContentImage.qml</file>
         <file>qml/qmlvideofx/ContentVideo.qml</file>
         <file>qml/qmlvideofx/Divider.qml</file>