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/plugins/avfoundation/camera/camera.pro | |
| 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/plugins/avfoundation/camera/camera.pro')
| -rw-r--r-- | src/plugins/avfoundation/camera/camera.pro | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index 8563eb655..a17ff5a73 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -37,7 +37,10 @@ HEADERS += \ avfcamerautility.h \ avfcameraviewfindersettingscontrol.h \ avfimageencodercontrol.h \ - avfcameraflashcontrol.h + avfcameraflashcontrol.h \ + avfvideoencodersettingscontrol.h \ + avfmediacontainercontrol.h \ + avfaudioencodersettingscontrol.h OBJECTIVE_SOURCES += \ avfcameraserviceplugin.mm \ @@ -57,7 +60,10 @@ OBJECTIVE_SOURCES += \ avfcamerautility.mm \ avfcameraviewfindersettingscontrol.mm \ avfimageencodercontrol.mm \ - avfcameraflashcontrol.mm + avfcameraflashcontrol.mm \ + avfvideoencodersettingscontrol.mm \ + avfmediacontainercontrol.mm \ + avfaudioencodersettingscontrol.mm osx { |