diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 16:11:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-30 07:33:04 +0200 |
| commit | 27681cba4695355f2a0a6b01b85c429186d11a34 (patch) | |
| tree | f11df2ec52d983b552f2e1b673e0845bc7e3ef05 /src/multimedia | |
| parent | f7a93757c709e8b2902bc4707752edb8649d009c (diff) | |
| parent | bc53bb7913bbf68519508a0ab76c513335b3e5bb (diff) | |
| download | qtmultimedia-27681cba4695355f2a0a6b01b85c429186d11a34.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Blacklisted a few functions in tst_QAudioInput.
Conflicts:
.qmake.conf
src/plugins/avfoundation/camera/avfcameracontrol.mm
src/plugins/avfoundation/camera/avfcameraservice.h
src/plugins/avfoundation/camera/avfcameraservice.mm
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
src/plugins/avfoundation/camera/avfimageencodercontrol.mm
src/plugins/avfoundation/camera/avfmediarecordercontrol.h
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
tests/auto/integration/qaudioinput/BLACKLIST
Task-number: QTBUG-54459
Task-number: QTBUG-49736
Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/camera/qcamera_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/multimedia/camera/qcamera_p.h b/src/multimedia/camera/qcamera_p.h index f4cfa6c2a..49b4376b2 100644 --- a/src/multimedia/camera/qcamera_p.h +++ b/src/multimedia/camera/qcamera_p.h @@ -78,6 +78,9 @@ public: infoControl(0), viewfinderSettingsControl(0), viewfinderSettingsControl2(0), + cameraExposure(0), + cameraFocus(0), + imageProcessing(0), viewfinder(0), capture(0), state(QCamera::UnloadedState), |