diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-04-19 12:50:12 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-04-19 13:24:12 +0000 |
| commit | 2170a3b0fcda613daf76a337fa45cb97e0714cdf (patch) | |
| tree | 26ec9176ec8f24c400791314c3e6582e245503c9 /src | |
| parent | 9047d9b84e9d94d193e77abd81f5980eff77d73a (diff) | |
AVFFoundation - fix a compilation error (iOS, XCode 7.3)
__weak previously was a simple noop, but now it ends up in a compilation
error in non-ARC'ed source code ('declaration uses __weak, but ARC is disabled').
Task-number: QTBUG-52671
Change-Id: I574519f892ba1d5f71488c5cc26423d04d5e02cf
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfmediaassetwriter.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/avfoundation/camera/avfmediaassetwriter.h b/src/plugins/avfoundation/camera/avfmediaassetwriter.h index 4759ae0a7..de8126295 100644 --- a/src/plugins/avfoundation/camera/avfmediaassetwriter.h +++ b/src/plugins/avfoundation/camera/avfmediaassetwriter.h @@ -80,12 +80,12 @@ QT_END_NAMESPACE // Serial queue for audio output: QT_PREPEND_NAMESPACE(AVFScopedPointer)<dispatch_queue_t> m_audioQueue; // Queue to write sample buffers: - __weak dispatch_queue_t m_writerQueue; + dispatch_queue_t m_writerQueue; QT_PREPEND_NAMESPACE(AVFScopedPointer)<AVAssetWriter> m_assetWriter; // Delegate's queue. - __weak dispatch_queue_t m_delegateQueue; - // TODO: QPointer?? + dispatch_queue_t m_delegateQueue; + QT_PREPEND_NAMESPACE(AVFMediaAssetWriterDelegate) *m_delegate; bool m_setStartTime; |