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/avfmediarecordercontrol_ios.h | |
| parent | f7a93757c709e8b2902bc4707752edb8649d009c (diff) | |
| parent | bc53bb7913bbf68519508a0ab76c513335b3e5bb (diff) | |
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/avfmediarecordercontrol_ios.h')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h index c3fe02c44..6736f4639 100644 --- a/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h +++ b/src/plugins/avfoundation/camera/avfmediarecordercontrol_ios.h @@ -45,6 +45,7 @@ #include "avfcamerautility.h" #include <QtMultimedia/qmediarecordercontrol.h> +#include <private/qvideooutputorientationhandler_p.h> #include <QtCore/qglobal.h> #include <QtCore/qurl.h> @@ -76,6 +77,7 @@ public: qreal volume() const Q_DECL_OVERRIDE; void applySettings() Q_DECL_OVERRIDE; + void unapplySettings(); public Q_SLOTS: void setState(QMediaRecorder::State state) Q_DECL_OVERRIDE; @@ -104,6 +106,10 @@ private: QMediaRecorder::State m_state; QMediaRecorder::Status m_lastStatus; + + NSDictionary *m_audioSettings; + NSDictionary *m_videoSettings; + QVideoOutputOrientationHandler m_orientationHandler; }; QT_END_NAMESPACE |