Get rid of QCameraViewFinderSettings

The outputs should control the camera settings that are
required. Before one could define resolutions and framerates
in several places, not it's the requested outputs that define it.

Change-Id: Iab76abac84480e6200b9fc5b058fc2a02b0a8ce0
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 0 insertions, 96 deletions

diff --git a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h b/src/imports/multimedia/qdeclarativecameraviewfinder_p.h
deleted file mode 100644
index 1b1090432..000000000
--- a/src/imports/multimedia/qdeclarativecameraviewfinder_p.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Jolla Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVECAMERAVIEWFINDER_P_H
-#define QDECLARATIVECAMERAVIEWFINDER_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists for the convenience
-// of other Qt classes.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <qcamera.h>
-#include <qmediarecorder.h>
-#include <qmediaencodersettings.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeCamera;
-
-class QDeclarativeCameraViewfinder : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QSize resolution READ resolution WRITE setResolution NOTIFY resolutionChanged)
-    Q_PROPERTY(qreal minimumFrameRate READ minimumFrameRate WRITE setMinimumFrameRate NOTIFY minimumFrameRateChanged)
-    Q_PROPERTY(qreal maximumFrameRate READ maximumFrameRate WRITE setMaximumFrameRate NOTIFY maximumFrameRateChanged)
-public:
-    QDeclarativeCameraViewfinder(QCamera *camera, QObject *parent = 0);
-    ~QDeclarativeCameraViewfinder();
-
-    QSize resolution() const;
-    void setResolution(const QSize &resolution);
-
-    qreal minimumFrameRate() const;
-    void setMinimumFrameRate(qreal frameRate);
-
-    qreal maximumFrameRate() const;
-    void setMaximumFrameRate(qreal frameRate);
-
-Q_SIGNALS:
-    void resolutionChanged();
-    void minimumFrameRateChanged();
-    void maximumFrameRateChanged();
-
-private Q_SLOTS:
-    void _q_cameraStatusChanged(QCamera::Status status);
-
-private:
-    QCamera *m_camera;
-    QCameraViewfinderSettings m_settings;
-};
-
-QT_END_NAMESPACE
-
-#endif