Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.6' into 5.7 · 27681cba
    Liang Qi authored
    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
    27681cba