1 files changed, 13 insertions, 9 deletions
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h
index 630cae166..1f4cfd984 100644
--- a/src/multimedia/camera/qcamera_p.h
+++ b/src/multimedia/camera/qcamera_p.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the Qt Toolkit.
 **
@@ -10,9 +10,9 @@
 ** 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.
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -23,8 +23,8 @@
 ** 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
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** $QT_END_LICENSE$
@@ -56,6 +56,8 @@ class QCameraControl;
 class QVideoDeviceSelectorControl;
 class QCameraLocksControl;
 class QCameraInfoControl;
+class QCameraViewfinderSettingsControl;
+class QCameraViewfinderSettingsControl2;
 
 class QCameraPrivate : public QMediaObjectPrivate
 {
@@ -68,11 +70,12 @@ public:
         deviceControl(0),
         locksControl(0),
         infoControl(0),
+        viewfinderSettingsControl(0),
+        viewfinderSettingsControl2(0),
         viewfinder(0),
         capture(0),
         state(QCamera::UnloadedState),
         error(QCamera::NoError),
-        supportedLocks(QCamera::NoLock),
         requestedLocks(QCamera::NoLock),
         lockStatus(QCamera::Unlocked),
         lockChangeReason(QCamera::UserRequest),
@@ -92,6 +95,8 @@ public:
     QVideoDeviceSelectorControl *deviceControl;
     QCameraLocksControl *locksControl;
     QCameraInfoControl *infoControl;
+    QCameraViewfinderSettingsControl *viewfinderSettingsControl;
+    QCameraViewfinderSettingsControl2 *viewfinderSettingsControl2;
 
     QCameraExposure *cameraExposure;
     QCameraFocus *cameraFocus;
@@ -105,7 +110,6 @@ public:
     QCamera::Error error;
     QString errorString;
 
-    QCamera::LockTypes supportedLocks;
     QCamera::LockTypes requestedLocks;
 
     QCamera::LockStatus lockStatus;