diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-15 03:04:31 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2019-10-15 07:00:43 +0000 |
commit | 0a7482b97a9247f728730c1a2cf222f8a24a88c4 (patch) | |
tree | edf415542a36413342c10e700471ced6268d62c7 /src/imports/multimedia/qdeclarativecamera.cpp | |
parent | 8277070128197744c0073c867dc78caea912bfce (diff) | |
parent | 56d430962a50af234902cd799920a5b6df6d80eb (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/multimedia/video/qvideoframe.cpp
src/plugins/directshow/player/directshowplayercontrol.cpp
Change-Id: I00840245e35861cf4fe1d62789815ca125b2052a
Diffstat (limited to 'src/imports/multimedia/qdeclarativecamera.cpp')
-rw-r--r-- | src/imports/multimedia/qdeclarativecamera.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativecamera.cpp b/src/imports/multimedia/qdeclarativecamera.cpp index 6d36e462d..91bda2ea2 100644 --- a/src/imports/multimedia/qdeclarativecamera.cpp +++ b/src/imports/multimedia/qdeclarativecamera.cpp @@ -177,7 +177,6 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : QObject(parent), m_camera(0), m_metaData(0), - m_viewfinder(0), m_pendingState(ActiveState), m_componentComplete(false) { @@ -190,6 +189,7 @@ QDeclarativeCamera::QDeclarativeCamera(QObject *parent) : m_flash = new QDeclarativeCameraFlash(m_camera); m_focus = new QDeclarativeCameraFocus(m_camera); m_imageProcessing = new QDeclarativeCameraImageProcessing(m_camera); + m_viewfinder = new QDeclarativeCameraViewfinder(m_camera); connect(m_camera, SIGNAL(captureModeChanged(QCamera::CaptureModes)), this, SIGNAL(captureModeChanged())); @@ -960,9 +960,6 @@ QDeclarativeMediaMetaData *QDeclarativeCamera::metaData() QDeclarativeCameraViewfinder *QDeclarativeCamera::viewfinder() { - if (!m_viewfinder) - m_viewfinder = new QDeclarativeCameraViewfinder(m_camera); - return m_viewfinder; } |