slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.5.0' into 5.5

Browse Source 
Change-Id: I5a5b387b93a4b9dbaa9710e78fd7bf1ca09aa3b3
This commit is contained in:
Liang Qi
2015-06-26 14:04:32 +02:00
parent dc9e10d4b7 04e086e336
commit fb000c9ecb
22 changed files with 240 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/avfoundation/camera/avfcameraflashcontrol.mm
View File

@@ -157,7 +157,7 @@ void AVFCameraFlashControl::cameraStateChanged(QCamera::State newState)
bool AVFCameraFlashControl::applyFlashSettings()
{
Q_ASSERT(m_session->state() == QCamera::ActiveState);
Q_ASSERT(m_session->requestedState() == QCamera::ActiveState);
AVCaptureDevice *captureDevice = m_session->videoCaptureDevice();
if (!captureDevice) {